Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
a18b10eb
Commit
a18b10eb
authored
Jan 05, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'add-const-materialNode-getter' into 'master'
Add const material node getter See merge request
!52
parents
795cc764
a00dc3cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
common/BaseObjectData.cc
common/BaseObjectData.cc
+4
-0
common/BaseObjectData.hh
common/BaseObjectData.hh
+4
-1
No files found.
common/BaseObjectData.cc
View file @
a18b10eb
...
...
@@ -270,6 +270,10 @@ MaterialNode* BaseObjectData::materialNode() {
return
materialNode_
;
}
const
MaterialNode
*
BaseObjectData
::
materialNode
()
const
{
return
materialNode_
;
}
BoundingBoxNode
*
BaseObjectData
::
boundingBoxNode
()
{
return
boundingBoxNode_
;
}
...
...
common/BaseObjectData.hh
View file @
a18b10eb
...
...
@@ -193,7 +193,10 @@ class DLLEXPORT BaseObjectData : public BaseObject
/// get a pointer to the materialnode
MaterialNode
*
materialNode
();
/// get a const pointer to the materialnode
const
MaterialNode
*
materialNode
()
const
;
/// get a pointer to the bounding box node
BoundingBoxNode
*
boundingBoxNode
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment