2.5 Buttons:
authorThomas Dinges <blender@dingto.org>
Fri, 22 May 2009 12:07:03 +0000 (12:07 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 22 May 2009 12:07:03 +0000 (12:07 +0000)
* Added initial Texture Buttons by William Reynish. Thanks!
Note: I did some code cleanup and fixes to the code.

* Texture RNA fixes.

release/ui/buttons_texture.py [new file with mode: 0644]
source/blender/makesrna/intern/rna_texture.c

diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
new file mode 100644 (file)
index 0000000..b00afe2
--- /dev/null
@@ -0,0 +1,336 @@
+
+import bpy
+
+class TextureButtonsPanel(bpy.types.Panel):
+       __space_type__ = "BUTTONS_WINDOW"
+       __region_type__ = "WINDOW"
+       __context__ = "texture"
+       
+       def poll(self, context):
+               ob = context.active_object
+               return (ob and ob.active_material.active_texture.texture)
+
+class TEXTURE_PT_texture(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_texture"
+       __label__ = "Texture"
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemR(tex, "type")
+
+class TEXTURE_PT_clouds(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_clouds"
+       __label__ = "Clouds"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "CLOUDS")   
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemR(tex, "stype", expand=True)
+               layout.itemL(text="Noise:")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               layout.itemR(tex, "noise_type", text="Type", expand=True)
+               
+               col = layout.column_flow()
+               col.itemR(tex, "noise_size", text="Size")
+               col.itemR(tex, "noise_depth", text="Depth")
+               col.itemR(tex, "nabla", text="Nabla")
+
+class TEXTURE_PT_wood(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_wood"
+       __label__ = "Wood"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "WOOD")     
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemR(tex, "noisebasis2", expand=True)
+               layout.itemR(tex, "stype", expand=True)
+               layout.itemL(text="Noise:")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               layout.itemR(tex, "noise_type", text="Type", expand=True)
+               
+               col = layout.column_flow()
+               col.itemR(tex, "noise_size", text="Size")
+               col.itemR(tex, "turbulence")
+               col.itemR(tex, "nabla")
+               
+class TEXTURE_PT_marble(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_marble"
+       __label__ = "Marble"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "MARBLE")   
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemR(tex, "stype", expand=True)
+               layout.itemR(tex, "noisebasis2", expand=True)
+               layout.itemL(text="Noise:")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               layout.itemR(tex, "noise_type", text="Type", expand=True)
+               
+               col = layout.column_flow()      
+               col.itemR(tex, "noise_size", text="Size")
+               col.itemR(tex, "noise_depth", text="Depth")
+               col.itemR(tex, "turbulence")
+               col.itemR(tex, "nabla")
+
+class TEXTURE_PT_magic(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_magic"
+       __label__ = "Magic"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "MAGIC")    
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+                       
+               row = layout.row()
+               row.itemR(tex, "noise_depth", text="Depth")
+               row.itemR(tex, "turbulence")
+
+class TEXTURE_PT_blend(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_blend"
+       __label__ = "Blend"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "BLEND")    
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+
+               layout.itemR(tex, "progression")
+               layout.itemR(tex, "flip_axis")
+                       
+class TEXTURE_PT_stucci(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_stucci"
+       __label__ = "Stucci"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "STUCCI")   
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemR(tex, "stype", expand=True)
+               layout.itemL(text="Noise:")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               layout.itemR(tex, "noise_type", text="Type", expand=True)
+               
+               row = layout.row()
+               row.itemR(tex, "noise_size", text="Size")
+               row.itemR(tex, "turbulence")
+               
+class TEXTURE_PT_image(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_image"
+       __label__ = "Image/Movie"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "IMAGE")    
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               split = layout.split()
+               
+               sub = split.column()            
+               sub.itemR(tex, "flip_axis")
+               sub.itemR(tex, "normal_map")
+               sub.itemL(text="Filter:")
+               sub.itemR(tex, "mipmap")
+               sub.itemR(tex, "mipmap_gauss")
+               sub.itemR(tex, "interpolation")
+               sub = split.column() 
+               sub.itemL(text="Alpha:")
+               sub.itemR(tex, "use_alpha")
+               sub.itemR(tex, "calculate_alpha")
+               sub.itemR(tex, "invert_alpha")
+
+class TEXTURE_PT_mapping(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_mapping"
+       __label__ = "Mapping"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "IMAGE")    
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+                               
+               split = layout.split()
+               
+               sub = split.column()
+               #sub.itemR(tex, "crop_rectangle")
+               sub.itemL(text="Crop Minimum:")
+               sub.itemR(tex, "crop_min_x", text="X")
+               sub.itemR(tex, "crop_min_y", text="Y")
+               sub = split.column()
+               sub.itemL(text="Crop Maximum:")
+               sub.itemR(tex, "crop_max_x", text="X")
+               sub.itemR(tex, "crop_max_y", text="Y")
+               
+               layout.itemR(tex, "extension")
+               
+               split = layout.split()
+               
+               sub = split.column()
+               if tex.extension == 'REPEAT': 
+                       sub.itemL(text="Repeat:")
+                       sub.itemR(tex, "repeat_x", text="X")
+                       sub.itemR(tex, "repeat_y", text="Y")
+                       sub = split.column()
+                       sub.itemL(text="Mirror:")
+                       sub.itemR(tex, "mirror_x", text="X")
+                       sub.itemR(tex, "mirror_y", text="Y")
+               elif tex.extension == 'CHECKER': 
+                       sub.itemR(tex, "checker_even", text="Even")
+                       sub.itemR(tex, "checker_odd", text="Odd")
+                       sub = split.column()
+                       sub.itemR(tex, "checker_distance", text="Distance")
+       
+class TEXTURE_PT_plugin(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_plugin"
+       __label__ = "Plugin"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "PLUGIN")   
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemL(text="Nothing yet")
+               
+class TEXTURE_PT_envmap(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_envmap"
+       __label__ = "Environment Map"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "ENVIRONMENT_MAP")  
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               layout.itemL(text="Nothing yet")
+               
+class TEXTURE_PT_musgrave(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_musgrave"
+       __label__ = "Musgrave"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "MUSGRAVE") 
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               
+               split = layout.split()
+               
+               sub = split.column()   
+               sub.itemR(tex, "highest_dimension", text="Dimension")
+               sub.itemR(tex, "lacunarity")
+               sub.itemR(tex, "octaves")
+               sub = split.column() 
+               if (tex.musgrave_type in ('HETERO_TERRAIN', 'RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')):
+                       sub.itemR(tex, "offset")
+               if (tex.musgrave_type in ('RIDGED_MULTIFRACTAL', 'HYBRID_MULTIFRACTAL')):
+                       sub.itemR(tex, "gain")
+                       sub.itemR(tex, "noise_intensity", text="Intensity")
+               
+               layout.itemL(text="Noise:")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               layout.itemR(tex, "musgrave_type")      
+               
+               row = layout.row()
+               row.itemR(tex, "noise_size", text="Size")
+               row.itemR(tex, "nabla")
+
+class TEXTURE_PT_voronoi(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_voronoi"
+       __label__ = "Voronoi"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "VORONOI")  
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+       
+               layout.itemR(tex, "distance_metric")
+               layout.itemR(tex, "color_type")
+               
+               split = layout.split()
+               
+               sub = split.column()   
+               sub.itemR(tex, "minkovsky_exponent", text="Minkovsky")
+               sub.itemR(tex, "noise_intensity", text="Intensity")
+               sub = split.column()
+               sub.itemR(tex, "feature_weights", slider=True)
+               
+               layout.itemL(text="Noise:")
+               
+               row = layout.row()
+               row.itemR(tex, "noise_size", text="Size")
+               row.itemR(tex, "nabla")
+                       
+class TEXTURE_PT_distortednoise(TextureButtonsPanel):
+       __idname__= "TEXTURE_PT_distortednoise"
+       __label__ = "Distorted Noise"
+       
+       def poll(self, context):
+               tex = context.active_object.active_material.active_texture.texture
+               return (tex and tex.type == "DISTORTED_NOISE")  
+
+       def draw(self, context):
+               layout = self.layout
+               tex = context.active_object.active_material.active_texture.texture
+               layout.itemR(tex, "noise_distortion")
+               layout.itemR(tex, "noise_basis", text="Basis")
+               
+               row = layout.row()
+               row.itemR(tex, "noise_size", text="Size")
+               row.itemR(tex, "nabla") 
+
+bpy.types.register(TEXTURE_PT_texture)
+bpy.types.register(TEXTURE_PT_clouds)
+bpy.types.register(TEXTURE_PT_wood)
+bpy.types.register(TEXTURE_PT_marble)
+bpy.types.register(TEXTURE_PT_magic)
+bpy.types.register(TEXTURE_PT_blend)
+bpy.types.register(TEXTURE_PT_stucci)
+bpy.types.register(TEXTURE_PT_image)
+bpy.types.register(TEXTURE_PT_mapping)
+bpy.types.register(TEXTURE_PT_plugin)
+bpy.types.register(TEXTURE_PT_envmap)
+bpy.types.register(TEXTURE_PT_musgrave)
+bpy.types.register(TEXTURE_PT_voronoi)
+bpy.types.register(TEXTURE_PT_distortednoise)
\ No newline at end of file
index ef3205836c18162e15ffba9b80110fd903e600f0..3fe5c98dc79ab4029b763e3872d9efc0423b8336 100644 (file)
@@ -266,8 +266,7 @@ static void rna_def_environment_map_common(StructRNA *srna)
                {ENV_STATIC, "STATIC", "Static", "Calculates environment map only once"},
                {ENV_ANIM, "ANIMATED", "Animated", "Calculates environment map at each rendering"},
                {ENV_LOAD, "LOADED", "Loaded", "Loads saved environment map from disk"},
                {ENV_STATIC, "STATIC", "Static", "Calculates environment map only once"},
                {ENV_ANIM, "ANIMATED", "Animated", "Calculates environment map at each rendering"},
                {ENV_LOAD, "LOADED", "Loaded", "Loads saved environment map from disk"},
-               {0, NULL, NULL, NULL}
-       };
+               {0, NULL, NULL, NULL}};
 
        prop= RNA_def_property(srna, "source", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "stype");
 
        prop= RNA_def_property(srna, "source", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "stype");
@@ -348,8 +347,7 @@ static EnumPropertyItem prop_noise_basis_items[] = {
 static EnumPropertyItem prop_noise_type[] = {
        {TEX_NOISESOFT, "SOFT_NOISE", "Soft Noise", ""},
        {TEX_NOISEPERL, "HARD_NOISE", "Hard Noise", ""},
 static EnumPropertyItem prop_noise_type[] = {
        {TEX_NOISESOFT, "SOFT_NOISE", "Soft Noise", ""},
        {TEX_NOISEPERL, "HARD_NOISE", "Hard Noise", ""},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
 
 static void rna_def_texture_clouds(BlenderRNA *brna)
 
 
 static void rna_def_texture_clouds(BlenderRNA *brna)
@@ -360,8 +358,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna)
        static EnumPropertyItem prop_clouds_stype[] = {
        {TEX_DEFAULT, "DEFAULT", "Default", ""},
        {TEX_COLOR, "COLOR", "Color", ""},
        static EnumPropertyItem prop_clouds_stype[] = {
        {TEX_DEFAULT, "DEFAULT", "Default", ""},
        {TEX_COLOR, "COLOR", "Color", ""},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "CloudsTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Clouds Texture", "Procedural noise texture.");
 
        srna= RNA_def_struct(brna, "CloudsTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Clouds Texture", "Procedural noise texture.");
@@ -411,15 +408,13 @@ static void rna_def_texture_wood(BlenderRNA *brna)
        {TEX_RING, "RINGS", "Rings", "Uses wood texture in rings"},
        {TEX_BANDNOISE, "BANDNOISE", "BandNoise", "Adds noise to standard wood"},
        {TEX_RINGNOISE, "RINGNOISE", "RingNoise", "Adds noise to rings"},
        {TEX_RING, "RINGS", "Rings", "Uses wood texture in rings"},
        {TEX_BANDNOISE, "BANDNOISE", "BandNoise", "Adds noise to standard wood"},
        {TEX_RINGNOISE, "RINGNOISE", "RingNoise", "Adds noise to rings"},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        static EnumPropertyItem prop_wood_noisebasis2[] = {
        {TEX_SIN, "SIN", "Sin", "Uses a sine wave to produce bands"},
        {TEX_SAW, "SAW", "Saw", "Uses a saw wave to produce bands"},
        {TEX_TRI, "TRI", "Tri", "Uses a triangle wave to produce bands"},
 
        static EnumPropertyItem prop_wood_noisebasis2[] = {
        {TEX_SIN, "SIN", "Sin", "Uses a sine wave to produce bands"},
        {TEX_SAW, "SAW", "Saw", "Uses a saw wave to produce bands"},
        {TEX_TRI, "TRI", "Tri", "Uses a triangle wave to produce bands"},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "WoodTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Wood Texture", "Procedural noise texture.");
 
        srna= RNA_def_struct(brna, "WoodTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Wood Texture", "Procedural noise texture.");
@@ -473,15 +468,13 @@ static void rna_def_texture_marble(BlenderRNA *brna)
        {TEX_SOFT, "SOFT", "Soft", "Uses soft marble"},
        {TEX_SHARP, "SHARP", "Sharp", "Uses more clearly defined marble"},
        {TEX_SHARPER, "SHARPER", "Sharper", "Uses very clearly defined marble"},
        {TEX_SOFT, "SOFT", "Soft", "Uses soft marble"},
        {TEX_SHARP, "SHARP", "Sharp", "Uses more clearly defined marble"},
        {TEX_SHARPER, "SHARPER", "Sharper", "Uses very clearly defined marble"},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        static EnumPropertyItem prop_marble_noisebasis2[] = {
        {TEX_SIN, "SIN", "Sin", "Uses a sine wave to produce bands"},
        {TEX_SAW, "SAW", "Saw", "Uses a saw wave to produce bands"},
        {TEX_TRI, "TRI", "Tri", "Uses a triangle wave to produce bands"},
 
        static EnumPropertyItem prop_marble_noisebasis2[] = {
        {TEX_SIN, "SIN", "Sin", "Uses a sine wave to produce bands"},
        {TEX_SAW, "SAW", "Saw", "Uses a saw wave to produce bands"},
        {TEX_TRI, "TRI", "Tri", "Uses a triangle wave to produce bands"},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "MarbleTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Marble Texture", "Procedural noise texture.");
 
        srna= RNA_def_struct(brna, "MarbleTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Marble Texture", "Procedural noise texture.");
@@ -514,6 +507,11 @@ static void rna_def_texture_marble(BlenderRNA *brna)
        RNA_def_property_enum_sdna(prop, NULL, "stype");
        RNA_def_property_enum_items(prop, prop_marble_stype);
        RNA_def_property_ui_text(prop, "Pattern", "");
        RNA_def_property_enum_sdna(prop, NULL, "stype");
        RNA_def_property_enum_items(prop, prop_marble_stype);
        RNA_def_property_ui_text(prop, "Pattern", "");
+       
+       prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
+       RNA_def_property_enum_items(prop, prop_noise_basis_items);
+       RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
 
        prop= RNA_def_property(srna, "noisebasis2", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "noisebasis2");
 
        prop= RNA_def_property(srna, "noisebasis2", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "noisebasis2");
@@ -562,8 +560,7 @@ static void rna_def_texture_blend(BlenderRNA *brna)
                {TEX_SPHERE, "SPHERICAL", "Spherical", "Creates a spherical progression"},
                {TEX_HALO, "QUADRATIC_SPHERE", "Quadratic sphere", "Creates a quadratic progression in the shape of a sphere"},
                {TEX_RAD, "RADIAL", "Radial", "Creates a radial progression"},
                {TEX_SPHERE, "SPHERICAL", "Spherical", "Creates a spherical progression"},
                {TEX_HALO, "QUADRATIC_SPHERE", "Quadratic sphere", "Creates a quadratic progression in the shape of a sphere"},
                {TEX_RAD, "RADIAL", "Radial", "Creates a radial progression"},
-               {0, NULL, NULL, NULL}
-       };
+               {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "BlendTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Blend Texture", "Procedural color blending texture.");
 
        srna= RNA_def_struct(brna, "BlendTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Blend Texture", "Procedural color blending texture.");
@@ -588,8 +585,7 @@ static void rna_def_texture_stucci(BlenderRNA *brna)
        {TEX_PLASTIC, "PLASTIC", "Plastic", "Uses standard stucci"},
        {TEX_WALLIN, "WALL_IN", "Wall in", "Creates Dimples"},
        {TEX_WALLOUT, "WALL_OUT", "Wall out", "Creates Ridges"},
        {TEX_PLASTIC, "PLASTIC", "Plastic", "Uses standard stucci"},
        {TEX_WALLIN, "WALL_IN", "Wall in", "Creates Dimples"},
        {TEX_WALLOUT, "WALL_OUT", "Wall out", "Creates Ridges"},
-       {0, NULL, NULL, NULL}
-       };
+       {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "StucciTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Stucci Texture", "Procedural noise texture.");
 
        srna= RNA_def_struct(brna, "StucciTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Stucci Texture", "Procedural noise texture.");
@@ -600,6 +596,11 @@ static void rna_def_texture_stucci(BlenderRNA *brna)
        RNA_def_property_range(prop, 0.0001, FLT_MAX);
        RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
        RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
        RNA_def_property_range(prop, 0.0001, FLT_MAX);
        RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
        RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
+       
+       prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
+       RNA_def_property_enum_items(prop, prop_noise_basis_items);
+       RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
 
        prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "noisesize");
 
        prop= RNA_def_property(srna, "noise_size", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "noisesize");
@@ -638,8 +639,7 @@ static void rna_def_texture_image(BlenderRNA *brna)
                {4, "CLIP_CUBE", "Clip Cube", "Clips to cubic-shaped area around the image and sets exterior pixels as transparent"},
                {3, "REPEAT", "Repeat", "Causes the image to repeat horizontally and vertically"},
                {5, "CHECKER", "Checker", "Causes the image to repeat in checker board pattern"},
                {4, "CLIP_CUBE", "Clip Cube", "Clips to cubic-shaped area around the image and sets exterior pixels as transparent"},
                {3, "REPEAT", "Repeat", "Causes the image to repeat horizontally and vertically"},
                {5, "CHECKER", "Checker", "Causes the image to repeat in checker board pattern"},
-               {0, NULL, NULL, NULL}
-       };
+               {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "ImageTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Image Texture", "");
 
        srna= RNA_def_struct(brna, "ImageTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Image Texture", "");
@@ -804,14 +804,13 @@ static void rna_def_texture_musgrave(BlenderRNA *brna)
                {TEX_HYBRIDMF, "HYBRID_MULTIFRACTAL", "Hybrid Multifractal", ""},
                {TEX_FBM, "FBM", "fBM", ""},
                {TEX_HTERRAIN, "HETERO_TERRAIN", "Hetero Terrain", ""},
                {TEX_HYBRIDMF, "HYBRID_MULTIFRACTAL", "Hybrid Multifractal", ""},
                {TEX_FBM, "FBM", "fBM", ""},
                {TEX_HTERRAIN, "HETERO_TERRAIN", "Hetero Terrain", ""},
-               {0, NULL, NULL, NULL}
-       };
+               {0, NULL, NULL, NULL}};
 
        srna= RNA_def_struct(brna, "MusgraveTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Musgrave", "Procedural musgrave texture.");
        RNA_def_struct_sdna(srna, "Tex");
 
 
        srna= RNA_def_struct(brna, "MusgraveTexture", "Texture");
        RNA_def_struct_ui_text(srna, "Musgrave", "Procedural musgrave texture.");
        RNA_def_struct_sdna(srna, "Tex");
 
-       prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+       prop= RNA_def_property(srna, "musgrave_type", PROP_ENUM, PROP_NONE);
        RNA_def_property_enum_sdna(prop, NULL, "stype");
        RNA_def_property_enum_items(prop, prop_musgrave_type);
        RNA_def_property_ui_text(prop, "Type", "");
        RNA_def_property_enum_sdna(prop, NULL, "stype");
        RNA_def_property_enum_items(prop, prop_musgrave_type);
        RNA_def_property_ui_text(prop, "Type", "");