[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27747] branches/render25/source/blender/ editors/object/object_edit.c: Render Branch: Fix vertex paint not getting restored after exiting editmode,

[Brecht Van Lommel]

Revision: 27747
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27747
Author:   blendix
Date:     2010-03-25 16:21:31 +0100 (Thu, 25 Mar 2010)

Log Message:
-----------
Render Branch: Fix vertex paint not getting restored after exiting editmode,
and fix the opposite problem when going to object mode from the menu.

Modified Paths:
--------------
    branches/render25/source/blender/editors/object/object_edit.c

Modified: branches/render25/source/blender/editors/object/object_edit.c
===================================================================
--- branches/render25/source/blender/editors/object/object_edit.c	2010-03-25 14:58:40 UTC (rev 27746)
+++ branches/render25/source/blender/editors/object/object_edit.c	2010-03-25 15:21:31 UTC (rev 27747)
@@ -305,7 +305,6 @@
 		WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, scene);
 
 		obedit->mode &= ~OB_MODE_EDIT;
-		ED_object_toggle_modes(C, obedit->restore_mode);
 	}
 }
 
@@ -348,8 +347,7 @@
 
 	ob->restore_mode = ob->mode;
 	ED_object_toggle_modes(C, ob->mode);
-
-	ob->mode |= OB_MODE_EDIT;
+	ob->mode= OB_MODE_EDIT;
 	
 	if(ob->type==OB_MESH) {
 		Mesh *me= ob->data;