[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40730] trunk/blender/source/blender: reverting part of rev40594.

[Sergey Sharybin]

Revision: 40730
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40730
Author:   nazgul
Date:     2011-10-01 13:46:20 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
reverting part of rev40594.

Pardoon, looks like i've forgot to revert current work before
commiting actual patch i wanted to send to the svn.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40594

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-10-01 11:21:47 UTC (rev 40729)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2011-10-01 13:46:20 UTC (rev 40730)
@@ -3226,7 +3226,7 @@
 	else
 		WM_event_add_notifier(C, NC_SCENE|NA_EDITED, scene);
 
-	return OPERATOR_PASS_THROUGH;
+	return OPERATOR_FINISHED;
 }
 
 void VIEW3D_OT_cursor3d(wmOperatorType *ot)

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2011-10-01 11:21:47 UTC (rev 40729)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2011-10-01 13:46:20 UTC (rev 40730)
@@ -1278,6 +1278,10 @@
 	}
 	/* Finished and pass through flag as handled */
 
+	/* Finished and pass through flag as handled */
+	if(retval == (OPERATOR_FINISHED|OPERATOR_PASS_THROUGH))
+		return WM_HANDLER_HANDLED;
+
 	/* Modal unhandled, break */
 	if(retval == (OPERATOR_PASS_THROUGH|OPERATOR_RUNNING_MODAL))
 		return (WM_HANDLER_BREAK|WM_HANDLER_MODAL);