X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fproperties.py;h=9d0d666a4f35661b3ce279fdf77a468040745d66;hb=ec7e6f12a85a7dd65e57bf88b80c2d94601dd56f;hp=f6de7a36acdb543fa6b2446eb28d08b8e14f32db;hpb=169057d48d44846bc433753f20ee884204be9192;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/properties.py b/blender/io_mspgl/properties.py
index f6de7a36..9d0d666a 100644
--- a/blender/io_mspgl/properties.py
+++ b/blender/io_mspgl/properties.py
@@ -12,9 +12,12 @@ class MspGLProperties(bpy.types.Panel):
 
 		self.layout.prop(obj, "technique");
 		self.layout.prop(obj, "inherit_tech");
+		if obj.inherit_tech:
+			self.layout.prop(obj, "override_material");
 		self.layout.prop(obj, "compound");
 
 def register_properties():
 	bpy.types.Object.technique = bpy.props.StringProperty(name="Technique", description="Name of the technique to use for rendering")
 	bpy.types.Object.inherit_tech = bpy.props.BoolProperty(name="Inherit technique", description="Inherit from the technique to customize textures")
+	bpy.types.Object.override_material = bpy.props.BoolProperty(name="Override material", description="Override material in the inherited texture as well", default=True)
 	bpy.types.Object.compound = bpy.props.BoolProperty(name="Compound with parent", description="Join this object to its parent when exporting")