diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 03:39:16 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-07 03:41:33 +0300 |
commit | d21809dd72be76dcd889ad784168c5107abe454f (patch) | |
tree | 2f017c83d27180f919199c19192785eafbc41973 /source/blender/editors/space_view3d/view3d_edit.c | |
parent | a3d647558e2234ee3c7acb338ed51e432d9ca92a (diff) |
3D View: skip hidden image empties when viewing all
D4463 by @pablodp606
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index fdafa064d4a..f6a9fc8d70c 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2692,6 +2692,7 @@ static int view3d_all_exec(bContext *C, wmOperator *op) { ARegion *ar = CTX_wm_region(C); View3D *v3d = CTX_wm_view3d(C); + RegionView3D *rv3d = CTX_wm_region_view3d(C); Scene *scene = CTX_data_scene(C); const Depsgraph *depsgraph = CTX_data_depsgraph(C); ViewLayer *view_layer_eval = DEG_get_evaluated_view_layer(depsgraph); @@ -2730,6 +2731,13 @@ static int view3d_all_exec(bContext *C, wmOperator *op) continue; } + if ((ob->type == OB_EMPTY) && + (ob->empty_drawtype == OB_EMPTY_IMAGE) && + !BKE_object_empty_image_frame_is_visible_in_view3d(ob, rv3d)) + { + continue; + } + BKE_object_minmax(base_eval->object, min, max, false); } } |