Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-20 12:11:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-20 12:11:26 +0400
commit6da7684ca63f9f396fe90ae8927ee3bf17a8106f (patch)
tree05ee7d5f431cb693cf741f5fbfb702b24d482367 /source/blender/makesrna/intern/rna_material.c
parent4f5f868a523430aa41de8bd63f888878aaf63002 (diff)
fixed [#23400] Unable to import *.3ds/*.obj files with textures
changed some rna names to be more consistant - use_texture -> use_image, since it sets if 'image' is used. - use_map_color_diff -> use_map_color_diffuse since diffuse is used elsewhere in the same type.
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
-rw-r--r--source/blender/makesrna/intern/rna_material.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index bc1c27b8fe1..a98e9a81443 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -352,7 +352,7 @@ static void rna_def_material_mtex(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "From Original", "Dupli's derive their object coordinates from the original objects transformation");
RNA_def_property_update(prop, 0, "rna_Material_update");
- prop= RNA_def_property(srna, "use_map_color_diff", PROP_BOOLEAN, PROP_NONE);
+ prop= RNA_def_property(srna, "use_map_color_diffuse", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mapto", MAP_COL);
RNA_def_property_ui_text(prop, "Diffuse Color", "Causes the texture to affect basic color of the material");
RNA_def_property_update(prop, 0, "rna_Material_update");