Use Material param if it is defined#128
Merged
rctoris merged 1 commit intoRobotWebTools:developfrom Sep 8, 2015
Merged
Conversation
rctoris
added a commit
that referenced
this pull request
Sep 8, 2015
Use Material param if it is defined
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix for #112
Previous logic: If the mesh has a defined material, use it instead of anything else. Only use the new material parameter if the material is undefined.
New logic: Use the parameter if it is defined. This relegates the decision to the creator of the MeshResource. The URDF will only pass in a valid parameter if the tag is defined in the XML. The Marker will only pass in the parameter if it is set to a non-zero value.