[Bf-blender-cvs] [2e50b4d] master: Minor changes:

Antony Riakiotakis noreply at git.blender.org
Fri Jul 25 15:27:36 CEST 2014


Commit: 2e50b4dc511567a3dfb280e30b5606873fc62d31
Author: Antony Riakiotakis
Date:   Fri Jul 25 15:27:03 2014 +0200
Branches: master
https://developer.blender.org/rB2e50b4dc511567a3dfb280e30b5606873fc62d31

Minor changes:

* Changing UV map updates the UV editor.
* UV Layer -> UV Map

===================================================================

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesrna/intern/rna_material.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 00a0c23..53de1dc 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1084,7 +1084,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
 
                 slot = mat.texture_paint_slots[mat.paint_active_slot]
                 col.separator()
-                col.label("UV Layer")
+                col.label("UV Map")
                 col.prop_search(slot, "uv_layer", ob.data, "uv_textures", text="")
 
 
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index bd87068..5cbbb2b 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -2210,7 +2210,8 @@ static void rna_def_tex_slot(BlenderRNA *brna)
 	RNA_def_property_string_maxlength(prop, 64); /* else it uses the pointer size! */
 	RNA_def_property_string_sdna(prop, NULL, "uvname");
 	RNA_def_property_ui_text(prop, "UV Map", "Name of UV map");
-	RNA_def_property_update(prop, 0, "rna_Material_update");
+	RNA_def_property_update(prop, NC_GEOM | ND_DATA, "rna_Material_update");
+
 }




More information about the Bf-blender-cvs mailing list