diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-06-10 17:07:02 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-06-10 17:07:02 +0400 |
commit | 4863feb95640bffa0a2c250f1b9da13100643fd2 (patch) | |
tree | a8063e3ac241cd1917b38671f45109d5c50fd60c /source/blender/blenkernel | |
parent | 183629b451902e32c4840864da55bc3c055fd393 (diff) |
Changes to mask evaluation
- BKE_mask_update_scene was only used with do_newframe=FALSE,
removed this argument.
- Made it so BKE_mask_update_scene is able to handle LIB_ID_RECALC_DATA
case. Namely, if mask ID is tagged for data update it means shapekeys
will be re-evaluated (as if do_newframe=true).
If mask id only tagged for LIB_ID_RECALC, then no shapekey evaluation
happens (same as it used to behave before).
This means, doing DAG_id_tag_update(&mask->id, OB_RECALC_DATA) will
lead to shapekeys re-evaluation which is really needed in such
operators as clearing shapekeys (and cleaning shapekeys which is
in tomato branch yet).
This is a bit silly to use OB_RECALC_DATA sine mask is not an OB,
but could not see better way to do it now.
This fixes missing mask re-evaluation after clearing shapekey,
would expect no other functional changes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mask.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_mask.h b/source/blender/blenkernel/BKE_mask.h index d5e5e36cd42..92332116ba6 100644 --- a/source/blender/blenkernel/BKE_mask.h +++ b/source/blender/blenkernel/BKE_mask.h @@ -120,7 +120,7 @@ void BKE_mask_update_display(struct Mask *mask, float ctime); void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe); void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe); void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const int do_newframe); -void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene, const int do_newframe); +void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene); void BKE_mask_parent_init(struct MaskParent *parent); void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u); void BKE_mask_calc_tangent_polyline(struct MaskSpline *spline, struct MaskSplinePoint *point, float t[2]); diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 68500549539..b3c5ceefb2d 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1525,13 +1525,14 @@ void BKE_mask_evaluate_all_masks(Main *bmain, float ctime, const int do_newframe } } -void BKE_mask_update_scene(Main *bmain, Scene *scene, const int do_newframe) +void BKE_mask_update_scene(Main *bmain, Scene *scene) { Mask *mask; for (mask = bmain->mask.first; mask; mask = mask->id.next) { - if (mask->id.flag & LIB_ID_RECALC) { - BKE_mask_evaluate_all_masks(bmain, CFRA, do_newframe); + if (mask->id.flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA)) { + bool do_new_frame = (mask->id.flag & LIB_ID_RECALC_DATA) != 0; + BKE_mask_evaluate_all_masks(bmain, CFRA, do_new_frame); } } } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 76727987355..9c376f9ea04 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1181,7 +1181,7 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen sound_update_scene(scene); /* update masking curves */ - BKE_mask_update_scene(bmain, scene, FALSE); + BKE_mask_update_scene(bmain, scene); } |