diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-24 14:23:57 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-01-24 14:34:14 +0300 |
commit | 991bda6959305cea58b9ce6a31224eea1889a4c5 (patch) | |
tree | 67b69a0baf469aa4d7f922bdffd828c7ff2a39bb /source | |
parent | 08ca32093a9927d98a94212d822518e184f1fcdd (diff) |
Depsgraph: Remove legacy depsgraph code from transform
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/transform/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 28 |
2 files changed, 4 insertions, 28 deletions
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index b7de49d8158..1a41d9ac95a 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -58,10 +58,6 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -if(WITH_LEGACY_DEPSGRAPH) - add_definitions(-DWITH_LEGACY_DEPSGRAPH) -endif() - add_definitions(${GL_DEFINITIONS}) blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index ce3d903b8f6..3e355deef33 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -828,7 +828,6 @@ static void pose_grab_with_ik_clear(Object *ob) bKinematicConstraint *data; bPoseChannel *pchan; bConstraint *con, *next; - bool need_dependency_update = false; for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) { /* clear all temporary lock flags */ @@ -843,7 +842,6 @@ static void pose_grab_with_ik_clear(Object *ob) data = con->data; if (data->flag & CONSTRAINT_IK_TEMP) { /* iTaSC needs clear for removed constraints */ - need_dependency_update = true; BIK_clear_data(ob->pose); BLI_remlink(&pchan->constraints, con); @@ -858,13 +856,8 @@ static void pose_grab_with_ik_clear(Object *ob) } } -#ifdef WITH_LEGACY_DEPSGRAPH - if (!DEG_depsgraph_use_legacy() && need_dependency_update) -#endif - { - /* TODO(sergey): Consider doing partial update only. */ - DAG_relations_tag_update(G.main); - } + /* TODO(sergey): Consider doing partial update only. */ + DAG_relations_tag_update(G.main); } /* adds the IK to pchan - returns if added */ @@ -1017,13 +1010,8 @@ static short pose_grab_with_ik(Object *ob) /* iTaSC needs clear for new IK constraints */ if (tot_ik) { BIK_clear_data(ob->pose); -#ifdef WITH_LEGACY_DEPSGRAPH - if (!DEG_depsgraph_use_legacy()) -#endif - { - /* TODO(sergey): Consuder doing partial update only. */ - DAG_relations_tag_update(G.main); - } + /* TODO(sergey): Consuder doing partial update only. */ + DAG_relations_tag_update(G.main); } return (tot_ik) ? 1 : 0; @@ -5421,11 +5409,6 @@ static void set_trans_object_base_flags(TransInfo *t) } } - /* all recalc flags get flushed to all layers, so a layer flip later on works fine */ -#ifdef WITH_LEGACY_DEPSGRAPH - DAG_scene_flush_update(G.main, t->scene, -1, 0); -#endif - /* and we store them temporal in base (only used for transform code) */ /* this because after doing updates, the object->recalc is cleared */ for (base = scene->base.first; base; base = base->next) { @@ -5503,9 +5486,6 @@ static int count_proportional_objects(TransInfo *t) /* all recalc flags get flushed to all layers, so a layer flip later on works fine */ DAG_scene_relations_update(G.main, t->scene); -#ifdef WITH_LEGACY_DEPSGRAPH - DAG_scene_flush_update(G.main, t->scene, -1, 0); -#endif /* and we store them temporal in base (only used for transform code) */ /* this because after doing updates, the object->recalc is cleared */ |