diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-19 19:48:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-09-19 19:48:47 +0400 |
| commit | fcbfd2979644d1b0eac963d49ee9f0e8f38d9f5b (patch) | |
| tree | d72946acfb6ae07118c883c97b1420be644feaea /source/blender/editors/space_view3d/view3d_select.c | |
| parent | d25ab89ac08db7598a62614b537ae4679f26a86d (diff) | |
Fix combined pose + weight paint mode, was using wrong object
in a few places, missing some checks.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index b1fec793b09..a37e916064c 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1148,7 +1148,7 @@ static void mouse_select(bContext *C, short *mval, short extend, short obcenter, WM_event_add_notifier(C, NC_OBJECT|ND_BONE_ACTIVE, basact->object); /* in weightpaint, we use selected bone to select vertexgroup, so no switch to new active object */ - if(basact->object->mode & OB_MODE_WEIGHT_PAINT) { + if(BASACT && BASACT->object->mode & OB_MODE_WEIGHT_PAINT) { /* prevent activating */ basact= NULL; } |