[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35494] trunk/blender/source/blender/ editors: More on bug #26432

[Ton Roosendaal]

Revision: 35494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35494
Author:   ton
Date:     2011-03-12 15:09:29 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
More on bug #26432

More undo-push disabling for switching render slots.
Also added 'undo push' print in debug mode (blender -d)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/util/undo.c

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2011-03-12 14:38:00 UTC (rev 35493)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2011-03-12 15:09:29 UTC (rev 35494)
@@ -2134,7 +2134,7 @@
 	WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
 
 	/* no undo push for browsing existing */
-	if(ima->renders[ima->render_slot])
+	if(ima->renders[ima->render_slot] || ima->render_slot==ima->last_render_slot)
 		return OPERATOR_CANCELLED;
 	
 	return OPERATOR_FINISHED;

Modified: trunk/blender/source/blender/editors/util/undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/undo.c	2011-03-12 14:38:00 UTC (rev 35493)
+++ trunk/blender/source/blender/editors/util/undo.c	2011-03-12 15:09:29 UTC (rev 35494)
@@ -80,6 +80,9 @@
 	Object *obedit= CTX_data_edit_object(C);
 	Object *obact= CTX_data_active_object(C);
 
+	if (G.f & G_DEBUG)
+		printf("undo push %s\n", str);
+	
 	if(obedit) {
 		if (U.undosteps == 0) return;