[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22867] branches/blender2.5/blender/source /blender/makesrna/intern: 2.5:
Thomas Dinges
dingto at gmx.de
Sat Aug 29 20:02:37 CEST 2009
Revision: 22867
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22867
Author: dingto
Date: 2009-08-29 20:02:37 +0200 (Sat, 29 Aug 2009)
Log Message:
-----------
2.5:
Bugfix: Preview-Render didn't update when changing material/texture id block/slot.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c 2009-08-29 17:25:26 UTC (rev 22866)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c 2009-08-29 18:02:37 UTC (rev 22867)
@@ -1658,11 +1658,13 @@
RNA_def_property_flag(prop, PROP_EDITABLE);
RNA_def_property_pointer_funcs(prop, activeget, activeset, NULL);
RNA_def_property_ui_text(prop, "Active Texture", "Active texture slot being displayed.");
+ RNA_def_property_update(prop, NC_TEXTURE|ND_SHADING_DRAW, NULL);
prop= RNA_def_property(srna, "active_texture_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "texact");
RNA_def_property_range(prop, 0, MAX_MTEX-1);
RNA_def_property_ui_text(prop, "Active Texture Index", "Index of active texture slot.");
+ RNA_def_property_update(prop, NC_TEXTURE|ND_SHADING_DRAW, NULL);
}
#endif
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c 2009-08-29 17:25:26 UTC (rev 22866)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c 2009-08-29 18:02:37 UTC (rev 22867)
@@ -1141,7 +1141,8 @@
RNA_def_property_int_sdna(prop, NULL, "actcol");
RNA_def_property_int_funcs(prop, "rna_Object_active_material_index_get", "rna_Object_active_material_index_set", "rna_Object_active_material_index_range");
RNA_def_property_ui_text(prop, "Active Material Index", "Index of active material slot.");
-
+ RNA_def_property_update(prop, NC_OBJECT|ND_SHADING, NULL);
+
/* transform */
prop= RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION);
More information about the Bf-blender-cvs
mailing list