[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40775] trunk/blender/source/blender/ editors/space_buttons/buttons_context.c: fix [#27526] shared data but different data materials.
Campbell Barton
ideasman42 at gmail.com
Mon Oct 3 18:55:00 CEST 2011
Revision: 40775
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40775
Author: campbellbarton
Date: 2011-10-03 16:55:00 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
fix [#27526] shared data but different data materials.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
Modified: trunk/blender/source/blender/editors/space_buttons/buttons_context.c
===================================================================
--- trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2011-10-03 16:20:05 UTC (rev 40774)
+++ trunk/blender/source/blender/editors/space_buttons/buttons_context.c 2011-10-03 16:55:00 UTC (rev 40775)
@@ -721,8 +721,12 @@
if(ptr) {
Object *ob= ptr->data;
- if(ob && ob->type && (ob->type<OB_LAMP) && ob->totcol)
- CTX_data_pointer_set(result, &ob->id, &RNA_MaterialSlot, ob->mat+ob->actcol-1);
+ if(ob && ob->type && (ob->type<OB_LAMP) && ob->totcol) {
+ /* a valid actcol isn't ensured [#27526] */
+ int matnr= ob->actcol-1;
+ if(matnr < 0) matnr= 0;
+ CTX_data_pointer_set(result, &ob->id, &RNA_MaterialSlot, &ob->mat[matnr]);
+ }
}
return 1;
More information about the Bf-blender-cvs
mailing list