griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed crash going from Sculpt Mode to Edit Mode.

Browse Source
This commit is contained in:
Nicholas Bishop
2007-01-07 19:45:05 +00:00
parent 7177bf9321
commit 8bd9d253e1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/src/drawview.c
View File

@@ -2603,7 +2603,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
Base *base;
Object *ob;
Scene *sce;
char retopo;
char retopo, sculpt;
/* update all objects, ipos, matrices, displists, etc. Flags set by depgraph or manual,
no layer check here, gets correct flushed */
@@ -2726,6 +2726,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
}
retopo= retopo_mesh_check() || retopo_curve_check();
sculpt= (G.f & G_SCULPTMODE) && !G.obedit;
if(retopo)
view3d_update_depths(v3d);
@@ -2737,7 +2738,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
}
}
if(!retopo && (G.f & G_SCULPTMODE) && !(sculpt_session()->active_ob->dtx & OB_DRAWXRAY))
if(!retopo && sculpt && !(sculpt_session()->active_ob->dtx & OB_DRAWXRAY))
view3d_update_depths(v3d);
if(G.moving) {
@@ -2752,7 +2753,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
view3d_draw_xray(v3d, 0); // clears zbuffer if it is used!
view3d_draw_transp(v3d, 0);
if(!retopo && (G.f & G_SCULPTMODE) && (sculpt_session()->active_ob->dtx & OB_DRAWXRAY))
if(!retopo && sculpt && (sculpt_session()->active_ob->dtx & OB_DRAWXRAY))
view3d_update_depths(v3d);
if(v3d->flag & V3D_CLIPPING)