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

[Brecht Van Lommel]

Revision: 27769
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27769
Author:   blendix
Date:     2010-03-26 12:05:22 +0100 (Fri, 26 Mar 2010)

Log Message:
-----------
Fix vertex paint not getting restored after exiting editmode,
and fix the opposite problem when going to object mode from the menu.
(commit 27747 by Brecht from render25 branch)

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

Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c   2010-03-26 
10:52:55 UTC (rev 27768)
+++ trunk/blender/source/blender/editors/object/object_edit.c   2010-03-26 
11:05:22 UTC (rev 27769)
@@ -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;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs