[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54155] trunk/blender: Fix [#34023] r54146 breaks name-display of default "UI_UL_list"

Bastien Montagne montagne29 at wanadoo.fr
Mon Jan 28 19:46:05 CET 2013


Revision: 54155
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54155
Author:   mont29
Date:     2013-01-28 18:46:04 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
Fix [#34023] r54146 breaks name-display of default "UI_UL_list"

draw_item *is* optional (it then uses default C function), even though there is not much sense to register a class without it, except for our default UI_UL_list!

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54146

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/__init__.py
    trunk/blender/source/blender/makesrna/intern/rna_ui.c

Modified: trunk/blender/release/scripts/startup/bl_ui/__init__.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/__init__.py	2013-01-28 17:49:15 UTC (rev 54154)
+++ trunk/blender/release/scripts/startup/bl_ui/__init__.py	2013-01-28 18:46:04 UTC (rev 54155)
@@ -138,7 +138,6 @@
 
 # Define a default UIList, when a list does not need any custom drawing...
 class UI_UL_list(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        pass
+    pass
 
 bpy.utils.register_class(UI_UL_list)

Modified: trunk/blender/source/blender/makesrna/intern/rna_ui.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui.c	2013-01-28 17:49:15 UTC (rev 54154)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui.c	2013-01-28 18:46:04 UTC (rev 54155)
@@ -863,7 +863,7 @@
 	func = RNA_def_function(srna, "draw_item", NULL);
 	RNA_def_function_ui_description(func, "Draw an item in the list (NOTE: when you define your own draw_item "
 	                                      "function, you may want to check given 'item' is of the right type...)");
-	RNA_def_function_flag(func, FUNC_REGISTER);
+	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
 	parm = RNA_def_pointer(func, "context", "Context", "", "");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	parm = RNA_def_pointer(func, "layout", "UILayout", "", "Layout to draw the item");




More information about the Bf-blender-cvs mailing list