Bugfix #4047

"Delete scene" should exit modes too, crashed in dependency graph then.
Now it exits editmode and paint modes first.

2 files changed, 9 insertions, 3 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) {
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 6be2aeab11e..26696b9bda2 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -767,8 +767,6 @@ long mesh_octree_table(Object *ob, float *co, char mode)
 		if(div[0]==0.0f) div[0]= 1.0f;
 		if(div[1]==0.0f) div[1]= 1.0f;
 		if(div[2]==0.0f) div[2]= 1.0f;
-			printvecf("ofs", offs);
-			printvecf("div", div);
 			
 		if(basetable) /* happens when entering this call without ending it */
 			mesh_octree_table(ob, co, 'e');