From 3208454aa81f57d40f51ffc47e026d2a00c4f4ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 3 Apr 2020 13:07:36 +0200 Subject: Cleanup: Animation, move AnimData API to `anim_data.c`/`BKE_anim_data.h` The `BKE_animsys.h` and `anim_sys.c` files already had a an "AnimData API" section. The code in that section has now been split off, and placed into `BKE_anim_data.h` and `anim_data.c`. All files that used to include `BKE_animsys.h` have been adjusted to only include the animation headers they need (sometimes none). No functional changes. --- source/blender/depsgraph/intern/builder/deg_builder.cc | 4 ---- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 1 + source/blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 +- source/blender/depsgraph/intern/depsgraph_tag.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 1 + source/blender/depsgraph/intern/node/deg_node_id.cc | 1 - 6 files changed, 4 insertions(+), 7 deletions(-) (limited to 'source/blender/depsgraph/intern') diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc index 18ab9bf7e43..d880618753c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder.cc @@ -37,10 +37,6 @@ #include "BKE_action.h" -extern "C" { -#include "BKE_animsys.h" -} - #include "intern/builder/deg_builder_cache.h" #include "intern/builder/deg_builder_remove_noop.h" #include "intern/depsgraph.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index eee1a9d2fc8..04333dbd038 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -66,6 +66,7 @@ extern "C" { #include "DNA_world_types.h" #include "BKE_action.h" +#include "BKE_anim_data.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_cachefile.h" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 9258af3e164..89def9e0bdc 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -69,7 +69,7 @@ extern "C" { #include "DNA_world_types.h" #include "BKE_action.h" -#include "BKE_animsys.h" +#include "BKE_anim_data.h" #include "BKE_armature.h" #include "BKE_collection.h" #include "BKE_collision.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 3b0782cd5d6..f1180c16a87 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -44,7 +44,7 @@ extern "C" { #include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" -#include "BKE_animsys.h" +#include "BKE_anim_data.h" #include "BKE_global.h" #include "BKE_idtype.h" #include "BKE_node.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index f51def4caa9..b87a877ae99 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -82,6 +82,7 @@ extern "C" { #endif #include "BKE_action.h" +#include "BKE_anim_data.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_editmesh.h" diff --git a/source/blender/depsgraph/intern/node/deg_node_id.cc b/source/blender/depsgraph/intern/node/deg_node_id.cc index 0bb09390b4f..4b6120a6985 100644 --- a/source/blender/depsgraph/intern/node/deg_node_id.cc +++ b/source/blender/depsgraph/intern/node/deg_node_id.cc @@ -34,7 +34,6 @@ extern "C" { #include "DNA_ID.h" #include "DNA_anim_types.h" -#include "BKE_animsys.h" #include "BKE_lib_id.h" } -- cgit v1.2.3