Support addint datafile statements for uniform material properties

diff --git a/source/materials/material.h b/source/materials/material.h
index 571f4cb027c4da3a41e8d317e1e4c042603a2706..350372dd144d4aadb194696e27bd86939cd85f2b 100644 (file)
--- a/source/materials/material.h
+++ b/source/materials/material.h
@@ -127,7 +127,8 @@ template<typename C>
 void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*set_value)(float), void (C::*set_texture)(const Texture *))
 {
        add(kw, &PropertyLoader<C>::property_value_scalar, set_value);
-       add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
+       if(set_texture)
+               add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>
@@ -140,7 +141,8 @@ void Material::PropertyLoader<C>::add_property(const std::string &kw, void (C::*
                add(kw, &PropertyLoader<C>::property_value_rgba, set_value);
                add(kw+"_srgb", &PropertyLoader<C>::property_value_srgb_alpha, set_value);
        }
-       add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
+       if(set_texture)
+               add(kw+"_map", &PropertyLoader<C>::property_texture, set_texture);
 }
 
 template<typename C>