diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-01-07 22:45:05 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-01-07 22:45:05 +0300 |
| commit | 8bd9d253e1bd9cf9a9e34c9eccaad216b0ff166f (patch) | |
| tree | 37a8119824925378d3bf9fd9bd9d8405a7f791f6 /source/blender/src/drawview.c | |
| parent | 7177bf9321b2dd4fc99128dd4f018cec6468d84f (diff) | |
Fixed crash going from Sculpt Mode to Edit Mode.
Diffstat (limited to 'source/blender/src/drawview.c')
| -rw-r--r-- | source/blender/src/drawview.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 961f07d9b22..0e73b28686b 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -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) |