diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 16:20:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 17:19:32 +0300 |
| commit | ba1cae5a04d429e2f4e58d5fd1e740c70462620a (patch) | |
| tree | a3299b49718e2cd74f412807fb97156a77d98efa /source/blender/editors/space_view3d | |
| parent | a2d24345bfead8e4279a818a67d73d42d2565b96 (diff) | |
Fix some inconsistencies in object visibility/selectability tests.
Diffstat (limited to 'source/blender/editors/space_view3d')
5 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index b29ce64eba5..3d7e8065a9f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -138,7 +138,7 @@ static bool WIDGETGROUP_armature_spline_poll(const bContext *C, wmGizmoGroupType ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = BKE_object_pose_armature_get(base->object); if (ob) { const bArmature *arm = ob->data; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 472c9571223..bf37f9c3b49 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -72,7 +72,7 @@ static bool WIDGETGROUP_camera_poll(const bContext *C, wmGizmoGroupType *UNUSED( ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->type == OB_CAMERA) { Camera *camera = ob->data; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.c b/source/blender/editors/space_view3d/view3d_gizmo_empty.c index 24236ac2e6c..b0eb9993576 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.c @@ -120,7 +120,7 @@ static bool WIDGETGROUP_empty_image_poll(const bContext *C, wmGizmoGroupType *UN ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->type == OB_EMPTY) { if (ob->empty_drawtype == OB_EMPTY_IMAGE) { diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c index 656836488ba..b49a38085a1 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.c @@ -64,7 +64,7 @@ static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmGizmoGroupType *UNU ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->pd && ob->pd->forcefield) { return true; diff --git a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c index 0edc30597c4..a723dae058a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c @@ -65,7 +65,7 @@ static bool WIDGETGROUP_lamp_spot_poll(const bContext *C, wmGizmoGroupType *UNUS ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->type == OB_LAMP) { Lamp *la = ob->data; @@ -174,7 +174,7 @@ static bool WIDGETGROUP_lamp_area_poll(const bContext *C, wmGizmoGroupType *UNUS ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->type == OB_LAMP) { Lamp *la = ob->data; @@ -258,7 +258,7 @@ static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmGizmoGroupType *UN ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = BASACT(view_layer); - if (base && BASE_VISIBLE(v3d, base) && BASE_SELECTABLE(v3d, base)) { + if (base && BASE_SELECTABLE(v3d, base)) { Object *ob = base->object; if (ob->type == OB_LAMP) { Lamp *la = ob->data; |