diff options
| -rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index de75f10c9c7..ef9c18af957 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -3208,15 +3208,11 @@ static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr) 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) diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index e8429960e82..0a7e4cff5f3 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -429,6 +429,7 @@ void rna_def_actuator(BlenderRNA *brna) 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); |