diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-10 17:19:14 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-10 17:19:14 +0300 |
| commit | dd97c080062bfa01883f6d6e9f2f6c0b8a0ba8c1 (patch) | |
| tree | 6ffe875d47aafc0a8d7dea9c45e94ee25f35589a /source/blender/editors/space_view3d/drawarmature.c | |
| parent | a7932f745243e5cb0192ec6bbef58dcea34faf0f (diff) | |
2.5
- Weightpaint back (CTRL+TAB or menu)
Also weightpaint is sortof non-modal, allowing to use all existing
hotkeys while in paint mode. Only leftmouse is overridden.
- Made vpaint and wpaint entirely local, stored in scene (and saved!)
- Small bugfix (also in 2.48): on weightpaint mode, all armature objects
in 3d window were drawing as active poses. Now only the armature
deformer is.
Nice point for the UI agenda: are paint modes on ACTION mouse? Only then
you can combine it with SELECT mouse...
Diffstat (limited to 'source/blender/editors/space_view3d/drawarmature.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 6f341c6a6fe..9fa045830ab 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -62,6 +62,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_global.h" #include "BKE_main.h" +#include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_ipo.h" #include "BKE_utildefines.h" @@ -2542,9 +2543,10 @@ int draw_armature(Scene *scene, View3D *v3d, Base *base, int dt, int flag) if ((flag & DRAW_SCENESET)==0) { if(ob==OBACT) arm->flag |= ARM_POSEMODE; - else if(G.f & G_WEIGHTPAINT) - arm->flag |= ARM_POSEMODE; - + else if(G.f & G_WEIGHTPAINT) { + if(OBACT && ob==modifiers_isDeformedByArmature(OBACT)) + arm->flag |= ARM_POSEMODE; + } draw_pose_paths(scene, v3d, ob); } } |