Improving Material shader code generation

2020-09-19 14:36:50 +02:00
parent 6814587b54
commit facbfed79c
72 changed files with 1049 additions and 329 deletions
@@ -31,9 +31,9 @@ void MaterialInstance::load()
    
 }

-inline std::string MaterialInstance::getMaterialName() const
+PMaterial MaterialInstance::getRenderMaterial() 
 {
-    return baseMaterial->getMaterialName();
+    return baseMaterial;    
 }

 PMaterial MaterialInstance::getBaseMaterial() const