[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48180] trunk/blender/source/blender/ editors/interface/interface_layout.c: [#31885] uiItemMenuEnumO / layout. operator_menu_enum() fails silently with bad property argument.

Dan Eicher dan at trollwerks.org
Thu Jun 21 22:14:30 CEST 2012


Revision: 48180
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48180
Author:   dna
Date:     2012-06-21 20:14:27 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
[#31885] uiItemMenuEnumO / layout.operator_menu_enum() fails silently with bad property argument.

uiItemsFullEnumO() not displaying an RNA_warning if the prop doesn't exist/isn't an enum

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2012-06-21 19:45:36 UTC (rev 48179)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2012-06-21 20:14:27 UTC (rev 48180)
@@ -843,6 +843,14 @@
 			MEM_freeN(item);
 		}
 	}
+	else if (prop && RNA_property_type(prop) != PROP_ENUM) {
+		RNA_warning("%s.%s, not an enum type", RNA_struct_identifier(ptr.type), propname);
+		return;
+	}
+	else {
+		RNA_warning("%s.%s not found", RNA_struct_identifier(ptr.type), propname);
+		return;
+	}
 }
 
 void uiItemsEnumO(uiLayout *layout, const char *opname, const char *propname)




More information about the Bf-blender-cvs mailing list