From 26e787dc9fb210c855138426e7c8fecbe00b7fbf Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Mon, 22 Jan 2007 00:48:53 +0000 Subject: [PATCH] == Retopo == Fixed bug #5773, retopo - if in wireframe mode should give an error/warning * Show error message for Retopo All button if view is in wireframe mode * When toggling view shading, update view depth data if shading isn't set to wireframe --- source/blender/src/edit.c | 4 ++++ source/blender/src/retopo.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c index e5e853d41f7..03bb19aed0a 100644 --- a/source/blender/src/edit.c +++ b/source/blender/src/edit.c @@ -1774,6 +1774,10 @@ void toggle_shading(void) if(G.vd->drawtype==OB_SOLID || G.vd->drawtype==OB_SHADED) G.vd->drawtype= OB_WIRE; else G.vd->drawtype= OB_SOLID; } + + if(G.vd->drawtype != OB_WIRE && G.vd->depths) { + G.vd->depths->damaged= 1; + } } void minmax_verts(float *min, float *max) diff --git a/source/blender/src/retopo.c b/source/blender/src/retopo.c index 7796984cef9..a344a3ae172 100644 --- a/source/blender/src/retopo.c +++ b/source/blender/src/retopo.c @@ -852,6 +852,11 @@ void retopo_do_all() void retopo_do_all_cb(void *j1, void *j2) { + if(G.vd->drawtype == OB_WIRE) { + error("Cannot apply retopo in wireframe mode"); + return; + } + retopo_do_all(); BIF_undo_push("Retopo all"); }