[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34508] trunk/blender/source/blender/ editors/space_image/image_buttons.c: fix from andguent on irc, wasn' t checking for property type.
Campbell Barton
ideasman42 at gmail.com
Wed Jan 26 17:21:55 CET 2011
Revision: 34508
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34508
Author: campbellbarton
Date: 2011-01-26 16:21:54 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
fix from andguent on irc, wasn't checking for property type.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_buttons.c
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c 2011-01-26 14:52:00 UTC (rev 34507)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c 2011-01-26 16:21:54 UTC (rev 34508)
@@ -781,15 +781,21 @@
if(!ptr->data)
return;
-
+
prop= RNA_struct_find_property(ptr, propname);
if(!prop) {
printf("uiTemplateImage: property not found: %s.%s\n", RNA_struct_identifier(ptr->type), propname);
return;
}
+ if(RNA_property_type(prop) != PROP_POINTER) {
+ printf("uiTemplateImage: expected pointer property for %s.%s\n", RNA_struct_identifier(ptr->type), propname);
+ return;
+ }
+
block= uiLayoutGetBlock(layout);
+
imaptr= RNA_property_pointer_get(ptr, prop);
ima= imaptr.data;
iuser= userptr->data;
More information about the Bf-blender-cvs
mailing list