diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_animsys.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 9 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder.cc | 45 |
3 files changed, 57 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_animsys.h b/source/blender/blenkernel/BKE_animsys.h index ddc158987c2..e9eea162ceb 100644 --- a/source/blender/blenkernel/BKE_animsys.h +++ b/source/blender/blenkernel/BKE_animsys.h @@ -162,6 +162,9 @@ void BKE_animdata_main_cb(struct Main *bmain, ID_AnimData_Edit_Callback func, vo /* Loop over all datablocks applying callback to all its F-Curves */ void BKE_fcurves_main_cb(struct Main *bmain, ID_FCurve_Edit_Callback func, void *user_data); +/* Look over all f-curves of a given ID. */ +void BKE_fcurves_id_cb(struct ID *id, ID_FCurve_Edit_Callback func, void *user_data); + /* ************************************* */ // TODO: overrides, remapping, and path-finding api's diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index acbf0068a57..7c1c26948b4 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1088,6 +1088,15 @@ static void adt_apply_all_fcurves_cb(ID *id, AnimData *adt, void *wrapper_data) } } +void BKE_fcurves_id_cb(ID *id, ID_FCurve_Edit_Callback func, void *user_data) +{ + AnimData *adt = BKE_animdata_from_id(id); + if (adt != NULL) { + AllFCurvesCbWrapper wrapper = {func, user_data}; + adt_apply_all_fcurves_cb(id, adt, &wrapper); + } +} + /* apply the given callback function on all F-Curves attached to data in main database */ void BKE_fcurves_main_cb(Main *bmain, ID_FCurve_Edit_Callback func, void *user_data) { diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index f5cf433aae8..e927d6c9b5c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -23,6 +23,8 @@ #include "intern/builder/deg_builder.h" +#include <cstring> + #include "DNA_anim_types.h" #include "DNA_layer_types.h" #include "DNA_ID.h" @@ -53,6 +55,46 @@ namespace DEG { * Base class for builders. */ +namespace { + +struct VisibilityCheckData { + eEvaluationMode eval_mode; + bool is_visibility_animated; +}; + +void visibility_animated_check_cb(ID * /*id*/, FCurve *fcu, void *user_data) +{ + VisibilityCheckData *data = + reinterpret_cast<VisibilityCheckData *>(user_data); + if (data->is_visibility_animated) { + return; + } + if (data->eval_mode == DAG_EVAL_VIEWPORT) { + if (STREQ(fcu->rna_path, "hide_viewport")) { + data->is_visibility_animated = true; + } + } else if (data->eval_mode == DAG_EVAL_RENDER) { + if (STREQ(fcu->rna_path, "hide_render")) { + data->is_visibility_animated = true; + } + } +} + +bool isObjectVisibilityAnimated(Depsgraph *graph, Object *object) +{ + AnimData* anim_data = BKE_animdata_from_id(&object->id); + if (anim_data == NULL) { + return false; + } + VisibilityCheckData data; + data.eval_mode = graph->mode; + data.is_visibility_animated = false; + BKE_fcurves_id_cb(&object->id, visibility_animated_check_cb, &data); + return data.is_visibility_animated; +} + +} // namespace + DepsgraphBuilder::DepsgraphBuilder(Main *bmain, Depsgraph *graph) : bmain_(bmain), graph_(graph) { @@ -65,6 +107,9 @@ bool DepsgraphBuilder::needPullBaseIntoGraph(struct Base *base) if (base->flag & base_flag) { return true; } + if (isObjectVisibilityAnimated(graph_, base->object)) { + return true; + } return false; } |