svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
[blender-staging.git] / source / blender / editors / space_logic / logic_window.c
index 9500b1afe3c1a6377675ee1b2803cc493b045b76..882d89fcd33c975c950e825603321a4b095a07c4 100644 (file)
@@ -3713,6 +3713,7 @@ static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
 
        row= uiLayoutRow(layout, 0);
        uiItemR(row, ptr, "layer", 0, NULL, ICON_NONE);
+       uiItemR(row, ptr, "layer_weight", 0, NULL, ICON_NONE);
 
        row= uiLayoutRow(layout, 0);
        uiItemPointerR(layout, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NONE);
@@ -3988,6 +3989,7 @@ static void draw_actuator_game(uiLayout *layout, PointerRNA *ptr)
                uiItemR(layout, ptr, "filename", 0, NULL, ICON_NONE);
 }
 
+/* The IPO/Fcurve actuator has been deprecated, so this is no longer used */
 static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr)
 {
        Object *ob;
@@ -4408,9 +4410,6 @@ static void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
                case ACT_GAME:
                        draw_actuator_game(box, ptr);
                        break;
-               case ACT_IPO:
-                       draw_actuator_ipo(box, ptr);
-                       break;
                case ACT_MESSAGE:
                        draw_actuator_message(box, ptr, C);
                        break;