diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-01-26 00:43:49 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-01-26 00:43:49 +0300 |
| commit | 497b028a33e7395bd2101f26c4ad4678b59d8ae2 (patch) | |
| tree | 33a791e933121dd54b35a1a8a9b2ded9ce8b476d /source/blender/src/editview.c | |
| parent | 8de165ff562ccac18b8ff3057797147129a062bf (diff) | |
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.
Diffstat (limited to 'source/blender/src/editview.c')
| -rw-r--r-- | source/blender/src/editview.c | 13 |
1 files changed, 6 insertions, 7 deletions
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) { |