[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52611] trunk/blender/source/blender: Move to layer: remove the OK button and make it apply immediately like it did

[Brecht Van Lommel]

Revision: 52611
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52611
Author:   blendix
Date:     2012-11-27 16:02:15 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Move to layer: remove the OK button and make it apply immediately like it did
before, is much nicer workflow. Now only if global undo is disabled will the
OK button show.

This is also a more generic fix for #26891 that solves other operators that
were also broken with global undo disabled.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_relations.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c	2012-11-27 16:02:12 UTC (rev 52610)
+++ trunk/blender/source/blender/editors/object/object_relations.c	2012-11-27 16:02:15 UTC (rev 52611)
@@ -1225,7 +1225,7 @@
 	return lay;
 }
 
-static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
+static int move_to_layer_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
 	View3D *v3d = CTX_wm_view3d(C);
 	if (v3d && v3d->localvd) {
@@ -1233,7 +1233,7 @@
 	}
 	else {
 		move_to_layer_init(C, op);
-		return WM_operator_props_dialog_popup(C, op, 260, 30);
+		return WM_operator_props_popup(C, op, event);
 	}
 }
 

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-11-27 16:02:12 UTC (rev 52610)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2012-11-27 16:02:15 UTC (rev 52611)
@@ -1207,13 +1207,17 @@
  * \note operator menu needs undo flag enabled , for redo callback */
 static int wm_operator_props_popup_ex(bContext *C, wmOperator *op, const int do_call)
 {
-	
 	if ((op->type->flag & OPTYPE_REGISTER) == 0) {
 		BKE_reportf(op->reports, RPT_ERROR,
 		            "Operator '%s' does not have register enabled, incorrect invoke function", op->type->idname);
 		return OPERATOR_CANCELLED;
 	}
 
+	/* if we don't have global undo, we can't do undo push for automatic redo,
+	 * so we require manual OK clicking in this popup */
+	if(!(U.uiflag & USER_GLOBALUNDO))
+		return WM_operator_props_dialog_popup(C, op, 300, UI_UNIT_Y);
+
 	ED_undo_push_op(C, op);
 
 	wm_operator_register(C, op);