[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50784] trunk/blender/source/blender/ editors/space_logic/logic_window.c: 2. 49 Logic Editor functionality - Add Sensor/Controller/ Actuator now possible for all selected objects (not only the active one)
Dalai Felinto
dfelinto at gmail.com
Fri Sep 21 06:12:55 CEST 2012
Revision: 50784
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50784
Author: dfelinto
Date: 2012-09-21 04:12:55 +0000 (Fri, 21 Sep 2012)
Log Message:
-----------
2.49 Logic Editor functionality - Add Sensor/Controller/Actuator now possible for all selected objects (not only the active one)
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_logic/logic_window.c
Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-09-21 04:09:09 UTC (rev 50783)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c 2012-09-21 04:12:55 UTC (rev 50784)
@@ -4448,7 +4448,7 @@
Object *act_ob= ob;
ID **idar;
- PointerRNA logic_ptr, settings_ptr;
+ PointerRNA logic_ptr, settings_ptr, object_ptr;
uiLayout *layout, *row, *box;
uiBlock *block;
@@ -4541,9 +4541,11 @@
row = uiLayoutRow(split, TRUE);
uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide controllers");
- if (ob == act_ob)
- uiItemMenuEnumO(row, "LOGIC_OT_controller_add", "type", "Add Controller", ICON_NONE);
+ RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
+ uiLayoutSetContextPointer(row, "object", &object_ptr);
+ uiItemMenuEnumO(row, "LOGIC_OT_controller_add", "type", "Add Controller", ICON_NONE);
+
if (RNA_boolean_get(&settings_ptr, "show_state_panel")) {
box = uiLayoutBox(layout);
@@ -4636,8 +4638,10 @@
row = uiLayoutRow(layout, TRUE);
uiDefButBitS(block, TOG, OB_SHOWSENS, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide sensors");
- if (ob == act_ob)
- uiItemMenuEnumO(row, "LOGIC_OT_sensor_add", "type", "Add Sensor", ICON_NONE);
+
+ RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
+ uiLayoutSetContextPointer(row, "object", &object_ptr);
+ uiItemMenuEnumO(row, "LOGIC_OT_sensor_add", "type", "Add Sensor", ICON_NONE);
if ((ob->scaflag & OB_SHOWSENS) == 0) continue;
@@ -4704,9 +4708,11 @@
row = uiLayoutRow(layout, TRUE);
uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name+2, (short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide actuators");
- if (ob == act_ob)
- uiItemMenuEnumO(row, "LOGIC_OT_actuator_add", "type", "Add Actuator", ICON_NONE);
+ RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
+ uiLayoutSetContextPointer(row, "object", &object_ptr);
+ uiItemMenuEnumO(row, "LOGIC_OT_actuator_add", "type", "Add Actuator", ICON_NONE);
+
if ((ob->scaflag & OB_SHOWACT) == 0) continue;
uiItemS(layout);
More information about the Bf-blender-cvs
mailing list