archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix #4047

Browse Source 
"Delete scene" should exit modes too, crashed in dependency graph then.
Now it exits editmode and paint modes first.
This commit is contained in:
Ton Roosendaal
2006-04-02 12:20:46 +00:00
parent 609fe2d575
commit 00737de5bd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/src/header_info.c
View File

@@ -58,6 +58,8 @@
#include "BDR_editcurve.h" #include "BDR_editcurve.h"
#include "BDR_editmball.h" #include "BDR_editmball.h"
#include "BDR_editobject.h" #include "BDR_editobject.h"
#include "BDR_editface.h"
#include "BDR_vpaint.h"
#include "BIF_editarmature.h" #include "BIF_editarmature.h"
#include "BIF_editfont.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 if(G.scene->id.next) sce= G.scene->id.next;
else return; else return;
if(okee("Delete current scene")) { 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 */ /* check all sets */
sce1= G.main->scene.first; sce1= G.main->scene.first;
while(sce1) { while(sce1) {

2
source/blender/src/meshtools.c
View File

@@ -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[0]==0.0f) div[0]= 1.0f;
if(div[1]==0.0f) div[1]= 1.0f; if(div[1]==0.0f) div[1]= 1.0f;
if(div[2]==0.0f) div[2]= 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 */ if(basetable) /* happens when entering this call without ending it */
mesh_octree_table(ob, co, 'e'); mesh_octree_table(ob, co, 'e');