[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28700] trunk/blender/source/blender: Added search list widget for 'actuator sensor' too.

Matt Ebb matt at mke3.net
Mon May 10 06:59:44 CEST 2010


Revision: 28700
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28700
Author:   broken
Date:     2010-05-10 06:59:44 +0200 (Mon, 10 May 2010)

Log Message:
-----------
Added search list widget for 'actuator sensor' too.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-10 04:49:09 UTC (rev 28699)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-05-10 04:59:44 UTC (rev 28700)
@@ -3208,15 +3208,11 @@
 
 static void draw_sensor_actuator(uiLayout *layout, PointerRNA *ptr)
 {
-	/* -- couldnt make it work for actuators
 	Object *ob = (Object *)ptr->id.data;
 	PointerRNA settings_ptr;
 
 	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-	uiItemPointerR(layout, ptr, "actuator", &settings_ptr, "actuators", "", 0);
-	*/
-
-	uiItemR(layout, ptr, "actuator", 0, NULL, 0);
+	uiItemPointerR(layout, ptr, "actuator", &settings_ptr, "actuators", NULL, ICON_LOGIC);
 }
 
 static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)

Modified: trunk/blender/source/blender/makesrna/intern/rna_actuator.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-05-10 04:49:09 UTC (rev 28699)
+++ trunk/blender/source/blender/makesrna/intern/rna_actuator.c	2010-05-10 04:59:44 UTC (rev 28700)
@@ -429,6 +429,7 @@
 
 	prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Name", "");
+	RNA_def_struct_name_property(srna, prop);
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);





More information about the Bf-blender-cvs mailing list