Changeset 11073 for code/branches/shaders_merge/src/libraries/tools/Mesh.h

Timestamp:

Jan 18, 2016, 10:12:53 PM (8 years ago)

Author:

landauf

Message:

merged branch 'shaders' into branch 'shaders_merge'

Location:

code/branches/shaders_merge

Files:

• . (modified) (1 prop)
• src/libraries/tools/Mesh.h (modified) (1 diff)

code/branches/shaders_merge/src/libraries/tools/Mesh.h

@@ -48 +48 @@
             const std::string& getName() const;
 
+            void setMaterial(const std::string& name);
+            const std::string& getMaterial() const;
+
             void setVisible(bool bVisible);
             bool isVisible() const;