From 497b028a33e7395bd2101f26c4ad4678b59d8ae2 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 25 Jan 2007 21:43:49 +0000 Subject: Two fixes: - Previous fix (commit today) for outliner-selecting and mode disabling forgot to do this for texture paint. - outliner: theme color drawing for background was using char with overflow possibility. --- source/blender/src/editview.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'source/blender/src/editview.c') diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 02b28f1e8d9..6a79d9b4ddd 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -1076,15 +1076,14 @@ void set_active_base(Base *base) /* activating a non-mesh, should end a couple of modes... */ if(base) { if(base->object->type!=OB_MESH) { - if(G.f & G_SCULPTMODE) { - set_sculptmode(); - } - if(G.f & G_WEIGHTPAINT) { + if(G.f & G_SCULPTMODE) + set_sculptmode(); /* toggle */ + if(G.f & G_WEIGHTPAINT) set_wpaint(); /* toggle */ - } - if(G.f & G_VERTEXPAINT) { + if(G.f & G_VERTEXPAINT) set_vpaint(); /* toggle */ - } + if(G.f & G_TEXTUREPAINT) + set_texturepaint(); /* Switch off tex paint */ } /* always end this */ if(G.f & G_FACESELECT) { -- cgit v1.2.3