diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-13 18:46:39 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-08-13 18:46:39 +0400 |
| commit | 135ee563e94b064ba4d4524a5a25c1c7b3964519 (patch) | |
| tree | 94043ed413f20fb8ccbceb3615c2d45e873a0b8a /source/blender/editors/space_outliner/space_outliner.c | |
| parent | 5096beb4a56f601c696aeab5e19c8e171a9b6cb3 (diff) | |
Fix crash happening when clearing parent in outliner modes which doesn't support this.
Diffstat (limited to 'source/blender/editors/space_outliner/space_outliner.c')
| -rw-r--r-- | source/blender/editors/space_outliner/space_outliner.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 00476cd467d..874852ee320 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -144,6 +144,10 @@ static int outliner_parent_clear_poll(bContext *C, wmDrag *drag, const wmEvent * UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]); + if (!ELEM4(soops->outlinevis, SO_ALL_SCENES, SO_CUR_SCENE, SO_VISIBLE, SO_GROUPS)) { + return FALSE; + } + if (drag->type == WM_DRAG_ID) { ID *id = (ID *)drag->poin; if (GS(id->name) == ID_OB) { |