X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fproperties.py;h=df18d444be9819e7d89c3c5446cfc00401fa1a18;hb=5bf3c7175c359ad8509702a4e0790609b39e6aec;hp=0605ba0c2b0fcab5e46dd6b2673275ce2243d7a1;hpb=180b20bee11425a776c5ead05afcf6a63945d3b2;p=libs%2Fgl.git diff --git a/blender/io_mspgl/properties.py b/blender/io_mspgl/properties.py index 0605ba0c..df18d444 100644 --- a/blender/io_mspgl/properties.py +++ b/blender/io_mspgl/properties.py @@ -64,16 +64,16 @@ class MspGLMaterialProperties(bpy.types.Panel): if not mat: return - self.layout_prop(mat, "render_mode") + self.layout.prop(mat, "render_mode") if mat.render_mode=='CUSTOM': - self.layout_prop(mat, "shader") + self.layout.prop(mat, "shader") elif mat.render_mode=='EXTERNAL': - self.layout_prop(mat, "technique") + self.layout.prop(mat, "technique") self.layout.prop(mat, "array_atlas") if mat.array_atlas: self.layout.prop(mat, "array_layer") if mat.render_mode!='EXTERNAL': - self.layout.prop(mat, "material_map") + self.layout.prop(mat, "material_atlas") class MspGLTextureNodeProperties(bpy.types.Panel): bl_idname = "NODE_PT_mspgl_properties" @@ -127,7 +127,7 @@ def register_properties(): bpy.types.Material.shader = bpy.props.StringProperty(name="Custom shader", description="Name of an external technique to use for rendering") bpy.types.Material.array_atlas = bpy.props.BoolProperty(name="Texture array atlas", description="The material is stored in a texture array") bpy.types.Material.array_layer = bpy.props.IntProperty("Texture array layer", description="Layer of the texture array atlas to use") - bpy.types.Material.material_map = bpy.props.BoolProperty(name="Material map", description="Make this material part of a material map") + bpy.types.Material.material_atlas = bpy.props.BoolProperty(name="Material atlas", description="Make this material part of a material atlas") bpy.types.ShaderNodeTexImage.default_filter = bpy.props.BoolProperty(name="Default filter", description="Let the loading program determine filtering options") bpy.types.ShaderNodeTexImage.use_mipmap = bpy.props.BoolProperty(name="Use mipmaps", description="Use mipmaps (automatically generated) for the texture", default=True)