Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-28 18:40:37 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-09-28 18:40:37 +0400
commit56e6338d81261c8ad84a7d3ee7b97a331ae381c2 (patch)
tree6091ab7b73665054da56a76e4af0f704b5b38a08
parentc1b32e850ff10ac32f4febb25b9c258add0e9536 (diff)
Fix #19453: rendering with mesh in edit mode would put the object
partially back in object mode, disabling e.g. X delete.
-rw-r--r--source/blender/editors/object/object_edit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index c734a7c606d..ee0b043a9a1 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -332,7 +332,7 @@ void ED_object_exit_editmode(bContext *C, int flag)
if(freedata) free_editMball(obedit);
}
- /* freedata only 0 now on file saves */
+ /* freedata only 0 now on file saves and render */
if(freedata) {
ListBase pidlist;
PTCacheID *pid;
@@ -357,10 +357,10 @@ void ED_object_exit_editmode(bContext *C, int flag)
if(flag & EM_WAITCURSOR) waitcursor(0);
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);
+ obedit->mode &= ~OB_MODE_EDIT;
+ ED_object_toggle_modes(C, obedit->restore_mode);
+ }
}