From fa5e5f898edcd25897e4dc288b853db11e6539bb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 5 Apr 2017 15:57:36 +0200 Subject: [PATCH] Cleanup: Remove depsgraph stubs --- source/blender/blenkernel/BKE_depsgraph.h | 18 ------ source/blender/blenkernel/intern/depsgraph.c | 67 -------------------- 2 files changed, 85 deletions(-) diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h index 93db48ce49a..00de4ca2f82 100644 --- a/source/blender/blenkernel/BKE_depsgraph.h +++ b/source/blender/blenkernel/BKE_depsgraph.h @@ -117,7 +117,6 @@ void DAG_scene_free(struct Scene *sce); * not cause any updates but is used by external render engines to detect if for * example a datablock was removed. */ -void DAG_scene_update_flags(struct Main *bmain, struct Scene *sce, unsigned int lay, const bool do_time, const bool do_invisible_flush); void DAG_on_visible_update(struct Main *bmain, const bool do_time); void DAG_id_tag_update(struct ID *id, short flag); @@ -136,15 +135,10 @@ int DAG_id_type_tagged(struct Main *bmain, short idtype); * DAG_ids_check_recalc and DAG_ids_clear_recalc are used for external render * engines to detect changes. */ -void DAG_scene_flush_update(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time); void DAG_ids_flush_tagged(struct Main *bmain); void DAG_ids_check_recalc(struct Main *bmain, struct Scene *scene, bool time); void DAG_ids_clear_recalc(struct Main *bmain); -/* Armature: sorts the bones according to dependencies between them */ - -void DAG_pose_sort(struct Object *ob); - /* Editors: callbacks to notify editors of datablock changes */ void DAG_editors_update_cb(void (*id_func)(struct Main *bmain, struct ID *id), @@ -155,25 +149,13 @@ void DAG_editors_update_pre(struct Main *bmain, struct Scene *scene, bool time); /* ** Threaded update ** */ -/* Initialize the DAG for threaded update. */ -void DAG_threaded_update_begin(struct Scene *scene, - void (*func)(void *node, void *user_data), - void *user_data); - -void DAG_threaded_update_handle_node_updated(void *node_v, - void (*func)(void *node, void *user_data), - void *user_data); - /* Debugging: print dependency graph for scene or armature object to console */ void DAG_print_dependencies(struct Main *bmain, struct Scene *scene, struct Object *ob); /* ************************ DAG querying ********************* */ -struct Object *DAG_get_node_object(void *node_v); -const char *DAG_get_node_name(struct Scene *scene, void *node_v); short DAG_get_eval_flags_for_object(struct Scene *scene, void *object); -bool DAG_is_acyclic(struct Scene *scene); /* ************************ DAG ********************* */ diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 1995196666a..c83b381ead2 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -53,73 +53,6 @@ #include "DEG_depsgraph_debug.h" #include "DEG_depsgraph_query.h" -/* ********************************************************************* - * Stubs to avoid linking issues and make sure legacy crap is not used * - * ********************************************************************* - */ - -void DAG_scene_flush_update(Main *UNUSED(bmain), - Scene *UNUSED(sce), - unsigned int UNUSED(lay), - const short UNUSED(time)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); -} - -void DAG_scene_update_flags(Main *UNUSED(bmain), - Scene *UNUSED(scene), - unsigned int UNUSED(lay), - const bool UNUSED(do_time), - const bool UNUSED(do_invisible_flush)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); -} - -/* ******************* DAG FOR ARMATURE POSE ***************** */ - -void DAG_pose_sort(Object *UNUSED(ob)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); -} - -/* ************************ DAG FOR THREADED UPDATE ********************* */ - -void DAG_threaded_update_begin(Scene *UNUSED(scene), - void (*func)(void *node, void *user_data), - void *UNUSED(user_data)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); - (void)func; -} - -void DAG_threaded_update_handle_node_updated(void *UNUSED(node_v), - void (*func)(void *node, void *user_data), - void *UNUSED(user_data)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); - (void)func; -} - -/* ************************ DAG querying ********************* */ - -Object *DAG_get_node_object(void *UNUSED(node_v)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); - return NULL; -} - -const char *DAG_get_node_name(Scene *UNUSED(scene), void *UNUSED(node_v)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); - return "INVALID"; -} - -bool DAG_is_acyclic(Scene *UNUSED(scene)) -{ - BLI_assert(!"Should not be used with new dependnecy graph"); - return false; -} - /* ************************ DAG ********************* */ /**