diff options
author | Sergey Sharybin <sergey@blender.org> | 2021-01-20 15:48:44 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2021-01-20 15:48:44 +0300 |
commit | b01c86568704d1916b4f496bccf055cfd59da7a4 (patch) | |
tree | e4a319db3172654fb0c94ad3df126c50900389e9 /source | |
parent | a73dfac5195681ad1deec55c317484ad077dafc4 (diff) | |
parent | 87db3423c98ea5d11a6bdbef6658b67970023a4e (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/mask/mask_query.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/mask/mask_query.c b/source/blender/editors/mask/mask_query.c index cf5997d8a18..cfd57ca3477 100644 --- a/source/blender/editors/mask/mask_query.c +++ b/source/blender/editors/mask/mask_query.c @@ -606,7 +606,14 @@ void ED_mask_point_pos__reverse( bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2]) { + Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); Mask *mask = CTX_data_edit_mask(C); + + /* Use evaluated mask to take animation into account. + * The animation of splies is not "flushed" back to original, so need to explicitly + * sue evaluated datablock here. */ + Mask *mask_eval = (Mask *)DEG_get_evaluated_id(depsgraph, &mask->id); + bool ok = false; if (mask == NULL) { @@ -614,7 +621,7 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2]) } INIT_MINMAX2(min, max); - for (MaskLayer *mask_layer = mask->masklayers.first; mask_layer != NULL; + for (MaskLayer *mask_layer = mask_eval->masklayers.first; mask_layer != NULL; mask_layer = mask_layer->next) { if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) { continue; |