diff options
author | Ton Roosendaal <ton@blender.org> | 2006-04-02 16:20:46 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-04-02 16:20:46 +0400 |
commit | 00737de5bd548580784d2aa424def0e8ab2081bc (patch) | |
tree | 7f7f753c889fe1d139d14dc00027134ce0abf93c /source/blender/src/header_info.c | |
parent | 609fe2d57590fe6a8e3ac3a064c651e2fc52c7e7 (diff) |
Bugfix #4047
"Delete scene" should exit modes too, crashed in dependency graph then.
Now it exits editmode and paint modes first.
Diffstat (limited to 'source/blender/src/header_info.c')
-rw-r--r-- | source/blender/src/header_info.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c index 44289723b2f..b43c6f28ef7 100644 --- a/source/blender/src/header_info.c +++ b/source/blender/src/header_info.c @@ -58,6 +58,8 @@ #include "BDR_editcurve.h" #include "BDR_editmball.h" #include "BDR_editobject.h" +#include "BDR_editface.h" +#include "BDR_vpaint.h" #include "BIF_editarmature.h" #include "BIF_editfont.h" @@ -478,7 +480,13 @@ void do_info_buttons(unsigned short event) else if(G.scene->id.next) sce= G.scene->id.next; else return; if(okee("Delete current scene")) { - + + /* exit modes... could become single call once */ + exit_editmode(1); + if(G.f & G_VERTEXPAINT) set_vpaint(); /* Switch off vertex paint */ + if(G.f & G_TEXTUREPAINT) set_texturepaint(); /* Switch off tex paint */ + if(G.f & G_WEIGHTPAINT) set_wpaint(); /* Switch off weight paint */ + /* check all sets */ sce1= G.main->scene.first; while(sce1) { |