Replace all old DAG calls with direct calls to new DEG and remove BKE_depsgraph.h
authorLuca Rood <dev@lucarood.com>
Thu, 8 Jun 2017 08:14:53 +0000 (10:14 +0200)
committerLuca Rood <dev@lucarood.com>
Thu, 8 Jun 2017 08:17:04 +0000 (10:17 +0200)
This removes BKE_depsgraph.h and depsgraph.c

176 files changed:
source/blender/blenkernel/BKE_depsgraph.h [deleted file]
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/depsgraph.c [deleted file]
source/blender/blenkernel/intern/object_facemap.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/SkinInfo.cpp
source/blender/collada/collada_utils.cpp
source/blender/draw/intern/draw_manager.c
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/drivers.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/armature/armature_naming.c
source/blender/editors/armature/armature_relations.c
source/blender/editors/armature/armature_utils.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_lib.c
source/blender/editors/armature/pose_select.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/armature/pose_utils.c
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editcurve_add.c
source/blender/editors/curve/editcurve_paint.c
source/blender/editors/curve/editfont.c
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/gpencil/gpencil_convert.c
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/interface_anim.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mask/CMakeLists.txt
source/blender/editors/mask/mask_add.c
source/blender/editors/mask/mask_ops.c
source/blender/editors/mask/mask_relationships.c
source/blender/editors/mask/mask_shapekey.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/mesh_navmesh.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_bake_api.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_data_transfer.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_facemap_ops.c
source/blender/editors/object/object_group.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_lattice.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_shapekey.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/dynamicpaint_ops.c
source/blender/editors/physics/particle_boids.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/rigidbody_constraint.c
source/blender/editors/physics/rigidbody_object.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/scene/CMakeLists.txt
source/blender/editors/scene/scene_edit.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_image_2d.c
source/blender/editors/sculpt_paint/paint_image_proj.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_action/action_buttons.c
source/blender/editors/space_clip/CMakeLists.txt
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_clip/tracking_ops_orient.c
source/blender/editors/space_clip/tracking_ops_plane.c
source/blender/editors/space_clip/tracking_ops_solve.c
source/blender/editors/space_clip/tracking_ops_stabilize.c
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_outliner/outliner_collections.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_camera_control.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/CMakeLists.txt
source/blender/editors/util/ed_transverts.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_animation.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_boid.c
source/blender/makesrna/intern/rna_cachefile.c
source/blender/makesrna/intern/rna_camera.c
source/blender/makesrna/intern/rna_cloth.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_curve_api.c
source/blender/makesrna/intern/rna_depsgraph.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_lattice_api.c
source/blender/makesrna/intern/rna_linestyle.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mask.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_meta.c
source/blender/makesrna/intern/rna_meta_api.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/makesrna/intern/rna_nla.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_screen.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_speaker.c
source/blender/makesrna/intern/rna_texture.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_vfont.c
source/blender/makesrna/intern/rna_world.c

diff --git a/source/blender/blenkernel/BKE_depsgraph.h b/source/blender/blenkernel/BKE_depsgraph.h
deleted file mode 100644 (file)
index 363f8c8..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2004 Blender Foundation.
- * All rights reserved.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef __BKE_DEPSGRAPH_H__
-#define __BKE_DEPSGRAPH_H__
-
-/** \file BKE_depsgraph.h
- *  \ingroup bke
- */
-
-/* Dependency Graph
- *
- * The dependency graph tracks relations between datablocks, and is used to
- * determine which datablocks need to be update based on dependencies and
- * visibility.
- *
- * It does not itself execute changes in objects, but rather sorts the objects
- * in the appropriate order and sets flags indicating they should be updated.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct Depsgraph;
-struct ID;
-struct Main;
-struct Object;
-struct Scene;
-
-/* Global initialization/deinitialization */
-void DAG_init(void);
-void DAG_exit(void);
-
-/* Build and Update
- *
- * DAG_scene_relations_update will rebuild the dependency graph for a given
- * scene if needed, and sort objects in the scene.
- *
- * DAG_relations_tag_update will clear all dependency graphs and mark them to
- * be rebuilt later. The graph is not rebuilt immediately to avoid slowdowns
- * when this function is call multiple times from different operators.
- *
- * DAG_scene_relations_rebuild forces an immediaterebuild of the dependency
- * graph, this is only needed in rare cases
- */
-
-void DAG_scene_relations_update(struct Main *bmain, struct Scene *sce);
-void DAG_scene_relations_validate(struct Main *bmain, struct Scene *sce);
-void DAG_relations_tag_update(struct Main *bmain);
-void DAG_scene_relations_rebuild(struct Main *bmain, struct Scene *scene);
-void DAG_scene_free(struct Scene *sce);
-
-/* Update Tagging
- *
- * DAG_scene_update_flags will mark all objects that depend on time (animation,
- * physics, ..) to be recalculated, used when changing the current frame.
- * 
- * DAG_on_visible_update will mark all objects that are visible for the first
- * time to be updated, for example on file load or changing layer visibility.
- *
- * DAG_id_tag_update will mark a given datablock to be updated. The flag indicates
- * a specific subset to be update (only object transform and data for now).
- *
- * DAG_id_type_tag marks a particular datablock type as having changing. This does
- * not cause any updates but is used by external render engines to detect if for
- * example a datablock was removed. */
-
-void DAG_on_visible_update(struct Main *bmain, const bool do_time);
-
-void DAG_id_tag_update(struct ID *id, short flag);
-void DAG_id_tag_update_ex(struct Main *bmain, struct ID *id, short flag);
-void DAG_id_type_tag(struct Main *bmain, short idtype);
-int  DAG_id_type_tagged(struct Main *bmain, short idtype);
-
-/* Flushing Tags
- *
- * DAG_scene_flush_update flushes object recalculation flags immediately to other
- * dependencies. Do not use outside of depsgraph.c, this will be removed.
- *
- * DAG_ids_flush_tagged will flush datablock update flags flags to dependencies,
- * use this right before updating to mark all the needed datablocks for update.
- *
- * DAG_ids_check_recalc and DAG_ids_clear_recalc are used for external render
- * engines to detect changes. */
-
-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);
-
-/* Editors: callbacks to notify editors of datablock changes */
-
-void DAG_editors_update_cb(void (*id_func)(struct Main *bmain, struct ID *id),
-                           void (*scene_func)(struct Main *bmain, struct Scene *scene, int updated),
-                           void (*scene_pre_func)(struct Main *bmain, struct Scene *scene, bool time));
-
-void DAG_editors_update_pre(struct Main *bmain, struct Scene *scene, bool time);
-
-/* ** Threaded update ** */
-
-/* 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 ********************* */
-
-short DAG_get_eval_flags_for_object(struct Scene *scene, void *object);
-
-#ifdef __cplusplus
-}
-#endif
-               
-#endif
index 71aeb393c974cbf08c29c6e0a70b47903c9ea313..44dcb0a51ae1a3ad8722cb6c325ef4a1d614f5ea 100644 (file)
@@ -97,7 +97,6 @@ set(SRC
        intern/customdata_file.c
        intern/data_transfer.c
        intern/deform.c
-       intern/depsgraph.c
        intern/displist.c
        intern/dynamicpaint.c
        intern/editderivedmesh.c
@@ -231,7 +230,6 @@ set(SRC
        BKE_customdata_file.h
        BKE_data_transfer.h
        BKE_deform.h
-       BKE_depsgraph.h
        BKE_displist.h
        BKE_dynamicpaint.h
        BKE_editmesh.h
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
deleted file mode 100644 (file)
index f99a4ac..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2004 Blender Foundation.
- * All rights reserved.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/blenkernel/intern/depsgraph.c
- *  \ingroup bke
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "MEM_guardedalloc.h"
-
-#ifdef WIN32
-#  include "BLI_winstuff.h"
-#endif
-
-#include "BLI_utildefines.h"
-
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_global.h"
-#include "BKE_depsgraph.h"
-#include "BKE_main.h"
-
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-#include "DEG_depsgraph_debug.h"
-#include "DEG_depsgraph_query.h"
-
-/* ************************ DAG ********************* */
-
-/* ************************************
- * This functions are to be supported *
- * ************************************
- */
-
-void DAG_init(void)
-{
-       DEG_register_node_types();
-}
-
-void DAG_exit(void)
-{
-       DEG_free_node_types();
-}
-
-/* ************************ API *********************** */
-
-void DAG_editors_update_cb(DEG_EditorUpdateIDCb id_func,
-                           DEG_EditorUpdateSceneCb scene_func,
-                           DEG_EditorUpdateScenePreCb scene_func_pre)
-{
-       DEG_editors_set_update_cb(id_func, scene_func, scene_func_pre);
-}
-
-void DAG_editors_update_pre(Main *bmain, Scene *scene, bool time)
-{
-       DEG_editors_update_pre(bmain, scene, time);
-}
-
-/* Tag all relations for update. */
-void DAG_relations_tag_update(Main *bmain)
-{
-       DEG_relations_tag_update(bmain);
-}
-
-/* Rebuild dependency graph only for a given scene. */
-void DAG_scene_relations_rebuild(Main *bmain, Scene *scene)
-{
-       DEG_scene_relations_rebuild(bmain, scene);
-}
-
-/* Create dependency graph if it was cleared or didn't exist yet. */
-void DAG_scene_relations_update(Main *bmain, Scene *scene)
-{
-       DEG_scene_relations_update(bmain, scene);
-}
-
-void DAG_scene_relations_validate(Main *bmain, Scene *scene)
-{
-       DEG_debug_scene_relations_validate(bmain, scene);
-}
-
-void DAG_scene_free(Scene *scene)
-{
-       DEG_scene_graph_free(scene);
-}
-
-void DAG_on_visible_update(Main *bmain, const bool do_time)
-{
-       DEG_on_visible_update(bmain, do_time);
-}
-
-void DAG_ids_check_recalc(Main *bmain, Scene *scene, bool time)
-{
-       DEG_ids_check_recalc(bmain, scene, time);
-}
-
-void DAG_id_tag_update(ID *id, short flag)
-{
-       DEG_id_tag_update_ex(G.main, id, flag);
-}
-
-void DAG_id_tag_update_ex(Main *bmain, ID *id, short flag)
-{
-       DEG_id_tag_update_ex(bmain, id, flag);
-}
-
-void DAG_id_type_tag(Main *bmain, short idtype)
-{
-       DEG_id_type_tag(bmain, idtype);
-}
-
-int DAG_id_type_tagged(Main *bmain, short idtype)
-{
-       return DEG_id_type_tagged(bmain, idtype);
-}
-
-void DAG_ids_clear_recalc(Main *bmain)
-{
-       DEG_ids_clear_recalc(bmain);
-}
-
-short DAG_get_eval_flags_for_object(Scene *scene, void *object)
-{
-       return DEG_get_eval_flags_for_id(scene->depsgraph, (ID *)object);
-}
-
-void DAG_ids_flush_tagged(Main *bmain)
-{
-       DEG_ids_flush_tagged(bmain);
-}
-
-/* ************************ DAG DEBUGGING ********************* */
-
-void DAG_print_dependencies(Main *UNUSED(bmain),
-                            Scene *scene,
-                            Object *UNUSED(ob))
-{
-       DEG_debug_graphviz(scene->depsgraph, stdout, "Depsgraph", false);
-}
index 02dedc100262d36fad0afed09c1fc35bbdc8c531..0e1e29f7bf3aac8feeec77d19da7e2c6b5c0c391 100644 (file)
@@ -41,8 +41,6 @@
 #include "BKE_object_facemap.h"  /* own include */
 #include "BKE_object_deform.h"
 
-#include "BKE_depsgraph.h"
-
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
 #include "BLI_string.h"
index bd47ee0214d7d24cfec8167ee113f9e1b7df12bd..5e6fe84d3a9012d692a3fbdc755cbc6adb9c542f 100644 (file)
@@ -1918,7 +1918,7 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No
                job->lay = BKE_scene_base_find(scene, job)->lay = 2;
 
                mul_v3_fl(job->size, 0.5f);
-               DAG_id_tag_update(&job->id, OB_RECALC_OB);
+               DEG_id_tag_update(&job->id, OB_RECALC_OB);
 
                verify_adt_action((ID *)&job->id, 1);
 
@@ -1939,14 +1939,14 @@ Object *AnimationImporter::get_joint_object(COLLADAFW::Node *root, COLLADAFW::No
                if (par_job) {
                        job->parent = par_job;
 
-                       DAG_id_tag_update(&par_job->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&par_job->id, OB_RECALC_OB);
                        job->parsubstr[0] = 0;
                }
 
                BKE_object_where_is_calc(scene, job);
 
                // after parenting and layer change
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
 
                joint_objects[node->getUniqueId()] = job;
        }
index c48c060dc95d3606cbab7d9328b93c8c5ac78264..c29f1748efccb26bc82c567579ff1f59cc25e187 100644 (file)
@@ -241,9 +241,9 @@ void SkinInfo::link_armature(bContext *C, Object *ob, std::map<COLLADAFW::Unique
        BKE_object_workob_calc_parent(scene, ob, &workob);
        invert_m4_m4(ob->parentinv, workob.obmat);
 
-       DAG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
+       DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA);
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
        copy_m4_m4(ob->obmat, bind_shape_matrix);
index 1ba8658f24535712097ddbb24fb2cf7cf82e245b..0f39b27316c3d493c54966dd163a0c303a4d76ae 100644 (file)
@@ -124,7 +124,7 @@ int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space)
 
        /** done once after import */
 #if 0
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 #endif
 
@@ -832,4 +832,4 @@ void bc_sanitize_mat(float mat[4][4], int precision)
        for (int i = 0; i < 4; i++)
                for (int j = 0; j < 4; j++)
                        mat[i][j] = double_round(mat[i][j], precision);
-}
\ No newline at end of file
+}
index de89f22649fcbb1d69a399d6fa8f5c1444367228..7d6907ec3184e8454f7edaa014e8dd6c9413dac8 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "BIF_glutil.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
 #include "BKE_pbvh.h"
index 1bf1bb2a474b6ce672f0a1505317e92a3b8bdbfe..13432e38669686f212f44b40adef7706d4b6f42c 100644 (file)
@@ -23,6 +23,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../gpu
        ../../makesdna
        ../../makesrna
index 22578b6a518ec5b0b597fd5a2ec4078d2f73a6fa..01575bff3c225d5c43f06699c7dad8f9d0190756 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BKE_depsgraph.h"
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"
@@ -59,6 +58,8 @@
 #include "BKE_global.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "UI_view2d.h"
 
 #include "ED_anim_api.h"
@@ -1721,7 +1722,7 @@ static int animchannels_delete_exec(bContext *C, wmOperator *UNUSED(op))
        
        /* send notifier that things have changed */
        WM_event_add_notifier(C, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_relations_tag_update(CTX_data_main(C));
 
        return OPERATOR_FINISHED;
 }
index cc77a321a8935857f466f4974644ebf5d33429aa..abdc6450abdfb0ca186cd49e719c354147c2ecc0 100644 (file)
 #include "BKE_fcurve.h"
 #include "BKE_gpencil.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "ED_anim_api.h"
@@ -77,7 +78,7 @@ void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
        adt = BKE_animdata_from_id(id);
        if (adt) {
                adt->recalc |= ADT_RECALC_ANIM;
-               DAG_id_tag_update(id, OB_RECALC_TIME);
+               DEG_id_tag_update(id, OB_RECALC_TIME);
        }
 
        /* update data */
@@ -98,7 +99,7 @@ void ANIM_list_elem_update(Scene *scene, bAnimListElem *ale)
        else {
                /* in other case we do standard depsgraph update, ideally
                 * we'd be calling property update functions here too ... */
-               DAG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
+               DEG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
        }
 }
 
@@ -114,7 +115,7 @@ void ANIM_id_update(Scene *UNUSED(scene), ID *id)
                        adt->recalc |= ADT_RECALC_ANIM;
                        
                /* set recalc flags */
-               DAG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
+               DEG_id_tag_update(id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); // XXX or do we want something more restrictive?
        }
 }
 
index 21c25f829b107d97c862c861ee47d6473212840f..7bda7f0522c3cf1cfe5b0efe821d5d1884146da2 100644 (file)
 #include "DNA_texture_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
@@ -841,7 +842,7 @@ static int add_driver_button_none(bContext *C, wmOperator *op, short mapping_typ
        if (success) {
                /* send updates */
                UI_context_update_anim_flag(C);
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
                WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
                
                return OPERATOR_FINISHED;
@@ -939,7 +940,7 @@ static int remove_driver_button_exec(bContext *C, wmOperator *op)
        if (success) {
                /* send updates */
                UI_context_update_anim_flag(C);
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
                WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
        }
        
index f2a35bb1553bc1ab049f7e134b4dce7f0b8c24e4..d29c0d722b55e182b505432b7821e8b7ea924d18 100644 (file)
@@ -56,7 +56,6 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_idcode.h"
 #include "BKE_nla.h"
@@ -66,6 +65,9 @@
 #include "BKE_key.h"
 #include "BKE_material.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_anim_api.h"
 #include "ED_keyframing.h"
 #include "ED_keyframes_edit.h"
@@ -155,7 +157,7 @@ bAction *verify_adt_action(ID *id, short add)
 
                /* tag depsgraph to be rebuilt to include time dependency */
                /* XXX: we probably should have bmain passed down, but that involves altering too many API's */
-               DAG_relations_tag_update(G.main);
+               DEG_relations_tag_update(G.main);
        }
                
        /* return the action */
@@ -1616,7 +1618,7 @@ static int clear_anim_v3d_exec(bContext *C, wmOperator *UNUSED(op))
                                /* delete F-Curve completely */
                                if (can_delete) {
                                        ANIM_fcurve_delete_from_animdata(NULL, adt, fcu);
-                                       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                                       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
                                        changed = true;
                                }
                        }
@@ -1723,7 +1725,7 @@ static int delete_key_v3d_exec(bContext *C, wmOperator *op)
                else
                        BKE_reportf(op->reports, RPT_ERROR, "No keyframes removed from Object '%s'", id->name + 2);
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;
        
index 4408ec26b3f01b91b87e9b3651bf07c0a75cf20d..fd73a27c9f6fcf55ab4736eb63e5689af32f34db 100644 (file)
 #include "BKE_main.h"
 #include "BKE_animsys.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_keyframing.h"
 #include "ED_screen.h"
 
@@ -1049,7 +1050,7 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
                                Object *ob = (Object *)ksp->id;
                                
                                // XXX: only object transforms?
-                               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                break;
                        }
                }
index b213aca478f01bde550891241b08819d161bd7ba..5348298f57e28c13a0a6fd3aa2c934e008e3f0ca 100644 (file)
@@ -23,6 +23,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../gpu
        ../../makesdna
        ../../makesrna
index c928508237da5b3bc16b6082a6ce5accee99bd3f..14db676cd0163b65b5b79b58763fcb4d486fb11d 100644 (file)
 #include "BKE_constraint.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -375,7 +376,7 @@ static int armature_flip_names_exec(bContext *C, wmOperator *UNUSED(op))
        BLI_freelistN(&bones_names);
        
        /* since we renamed stuff... */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* copied from #rna_Bone_update_renamed */
        /* redraw view */
@@ -425,7 +426,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op)
        CTX_DATA_END;
        
        /* since we renamed stuff... */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
index 0dc97483dfc7122adf848c4ec3b60122e48e1d09..a6f63548c965e7819378f6822ff6d9eca08f8ab3 100644 (file)
 #include "BKE_animsys.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -406,7 +408,7 @@ int join_armature_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
        
-       DAG_relations_tag_update(bmain);  /* because we removed object(s) */
+       DEG_relations_tag_update(bmain);  /* because we removed object(s) */
 
        ED_armature_from_edit(arm);
        ED_armature_edit_free(arm);
@@ -624,7 +626,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
        
        /* 2) duplicate base */
        newbase = ED_object_add_duplicate(bmain, scene, sl, oldbase, USER_DUP_ARM); /* only duplicate linked armature */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        newob = newbase->object;
        newbase->flag &= ~BASE_SELECTED;
@@ -638,8 +640,8 @@ static int separate_armature_exec(bContext *C, wmOperator *op)
        /* 4) fix links before depsgraph flushes */ // err... or after?
        separated_armature_fix_links(oldob, newob);
        
-       DAG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
-       DAG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
+       DEG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
+       DEG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
        
        
        /* 5) restore original conditions */
index a3b439536b7e31fd3035a311e0b2706e6f446328..a2663cdd935345f03e8881078bc4ad8ff940e812 100644 (file)
 #include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_main.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_armature.h"
 #include "ED_util.h"
 
@@ -672,7 +673,7 @@ void ED_armature_from_edit(bArmature *arm)
                }
        }
        
-       DAG_id_tag_update(&arm->id, 0);
+       DEG_id_tag_update(&arm->id, 0);
 }
 
 void ED_armature_edit_free(struct bArmature *arm)
index 86b7271bfffbe05a1970f666bca001df3d1854a4..736329d29bfc2a5974acc3ee735dbb4d6e36aba4 100644 (file)
 #include "BKE_armature.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -580,7 +581,7 @@ static void pose_copy_menu(Scene *scene)
                        BKE_pose_tag_recalc(bmain, ob->pose);
        }
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA); // and all its relations
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA); // and all its relations
        
        BIF_undo_push("Copy Pose Attributes");
        
@@ -613,7 +614,7 @@ static int pose_flip_names_exec(bContext *C, wmOperator *UNUSED(op))
        BLI_freelistN(&bones_names);
        
        /* since we renamed stuff... */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -660,7 +661,7 @@ static int pose_autoside_names_exec(bContext *C, wmOperator *op)
        CTX_DATA_END;
        
        /* since we renamed stuff... */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -709,7 +710,7 @@ static int pose_bone_rotmode_exec(bContext *C, wmOperator *op)
        CTX_DATA_END;
        
        /* notifiers and updates */
-       DAG_id_tag_update((ID *)ob, OB_RECALC_DATA);
+       DEG_id_tag_update((ID *)ob, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
        
        return OPERATOR_FINISHED;
@@ -1166,7 +1167,7 @@ static int pose_flip_quats_exec(bContext *C, wmOperator *UNUSED(op))
        CTX_DATA_END;
        
        /* notifiers and updates */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
        
        return OPERATOR_FINISHED;
index e3c64b523b1c35f410e2d40b0e0acb86fb4d24c6..c43363381766c61c9f972d5c67c1f52abb85a84c 100644 (file)
@@ -46,7 +46,6 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_library.h"
@@ -55,6 +54,8 @@
 #include "BKE_context.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -1090,7 +1091,7 @@ static void poselib_preview_apply(bContext *C, wmOperator *op)
                 */
                // FIXME: shouldn't this use the builtin stuff?
                if ((pld->arm->flag & ARM_DELAYDEFORM) == 0)
-                       DAG_id_tag_update(&pld->ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+                       DEG_id_tag_update(&pld->ob->id, OB_RECALC_DATA);  /* sets recalc flags */
                else
                        BKE_pose_where_is(pld->scene, pld->ob);
        }
@@ -1598,7 +1599,7 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
                 *      - note: code copied from transform_generics.c -> recalcData()
                 */
                if ((arm->flag & ARM_DELAYDEFORM) == 0)
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
                else
                        BKE_pose_where_is(scene, ob);
        }
@@ -1611,7 +1612,7 @@ static void poselib_preview_cleanup(bContext *C, wmOperator *op)
                action_set_activemarker(act, marker, NULL);
                
                /* Update event for pose and deformation children */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                
                /* updates */
                if (IS_AUTOKEY_MODE(scene, NORMAL)) {
index fdc58f6e2536cbb94eda45747ba01419e36e661d..0d1752e07a19349c5b624ec88aa9ef222c5b5c68 100644 (file)
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -122,7 +123,7 @@ void ED_pose_bone_select(Object *ob, bPoseChannel *pchan, bool select)
                 * (see rna_Bone_select_update() in rna_armature.c for details)
                 */
                if (arm->flag & ARM_HAS_VIZ_DEPS) {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
                
                /* send necessary notifiers */
@@ -197,7 +198,7 @@ bool ED_do_pose_selectbuffer(
                        if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
                                if (nearBone == arm->act_bone) {
                                        ED_vgroup_select_by_name(ob_act, nearBone->name);
-                                       DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+                                       DEG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
                                }
                        }
                        /* if there are some dependencies for visualizing armature state 
@@ -207,7 +208,7 @@ bool ED_do_pose_selectbuffer(
                                /* NOTE: ob not ob_act here is intentional - it's the source of the 
                                 *       bones being selected  [T37247]
                                 */
-                               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        }
                }
        }
@@ -314,7 +315,7 @@ static int pose_select_connected_invoke(bContext *C, wmOperator *op, const wmEve
        
        if (arm->flag & ARM_HAS_VIZ_DEPS) {
                /* mask modifier ('armature' mode), etc. */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
 
        return OPERATOR_FINISHED;
@@ -370,7 +371,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
        
        /* weightpaint or mask modifiers need depsgraph updates */
        if (multipaint || (arm->flag & ARM_HAS_VIZ_DEPS)) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
 
        return OPERATOR_FINISHED;
@@ -422,7 +423,7 @@ static int pose_select_parent_exec(bContext *C, wmOperator *UNUSED(op))
        
        if (arm->flag & ARM_HAS_VIZ_DEPS) {
                /* mask modifier ('armature' mode), etc. */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        
        return OPERATOR_FINISHED;
@@ -489,7 +490,7 @@ static int pose_select_constraint_target_exec(bContext *C, wmOperator *UNUSED(op
        
        if (arm->flag & ARM_HAS_VIZ_DEPS) {
                /* mask modifier ('armature' mode), etc. */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        
        return OPERATOR_FINISHED;
@@ -583,7 +584,7 @@ static int pose_select_hierarchy_exec(bContext *C, wmOperator *op)
        
        if (arm->flag & ARM_HAS_VIZ_DEPS) {
                /* mask modifier ('armature' mode), etc. */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        
        return OPERATOR_FINISHED;
@@ -828,7 +829,7 @@ static int pose_select_grouped_exec(bContext *C, wmOperator *op)
        
        if (arm->flag & ARM_HAS_VIZ_DEPS) {
                /* mask modifier ('armature' mode), etc. */
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        
        /* report done status */
@@ -921,7 +922,7 @@ static int pose_select_mirror_exec(bContext *C, wmOperator *op)
                /* in weightpaint we select the associated vertex group too */
                if (ob_act->mode & OB_MODE_WEIGHT_PAINT) {
                        ED_vgroup_select_by_name(ob_act, pchan_mirror_act->name);
-                       DAG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob_act->id, OB_RECALC_DATA);
                }
        }
 
index 063ba37f20d614b1e8add0e2ccfcc0f61f946055..c2f66db63f8c9e9fdcea73ad26808ecb2290b8f5 100644 (file)
 #include "BKE_blender_copybuffer.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -225,7 +226,7 @@ static int pose_visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
        }
        CTX_DATA_END;
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
@@ -534,7 +535,7 @@ static int pose_paste_exec(bContext *C, wmOperator *op)
        }
        BKE_main_free(tmp_bmain);
        /* Update event for pose and deformation children. */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        /* Notifiers for updates, */
        WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob);
 
@@ -760,7 +761,7 @@ static int pose_clear_transform_generic_exec(bContext *C, wmOperator *op,
                        ED_pose_recalculate_paths(scene, ob);
        }
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
@@ -907,7 +908,7 @@ static int pose_clear_user_transforms_exec(bContext *C, wmOperator *op)
        }
        
        /* notifiers and updates */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, ob);
        
        return OPERATOR_FINISHED;
index b960bec3603a724ec1ab53c6b2d25723de4d9cbd..124cf24f12b014f3f6a39c11de294c5b25795690 100644 (file)
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
 
 #include "BKE_context.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "WM_api.h"
@@ -187,7 +188,7 @@ void poseAnim_mapping_refresh(bContext *C, Scene *scene, Object *ob)
         */
        /* FIXME: shouldn't this use the builtin stuff? */
        if ((arm->flag & ARM_DELAYDEFORM) == 0)
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);  /* sets recalc flags */
        else
                BKE_pose_where_is(scene, ob);
        
index 2f5b2ab6e87e5187b65fa5618ed189833e4b6fc9..ae5c0a13cedc304bbabe5511b07a1e369b974dfb 100644 (file)
@@ -23,6 +23,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../gpu
        ../../makesdna
        ../../makesrna
index da23c6ab22266731de8c74381c47a86d80ee0ff9..b3f1f4f59beffee6df4b71809ae2afd04b77005d 100644 (file)
@@ -45,7 +45,6 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_displist.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
@@ -58,6 +57,9 @@
 #include "BKE_action.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -1315,7 +1317,7 @@ static int separate_exec(bContext *C, wmOperator *op)
 
        /* 2. duplicate the object and data */
        newbase = ED_object_add_duplicate(bmain, scene, sl, oldbase, 0); /* 0 = fully linked */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        newob = newbase->object;
        newcu = newob->data = BKE_curve_copy(bmain, oldcu);
@@ -1334,8 +1336,8 @@ static int separate_exec(bContext *C, wmOperator *op)
        ED_curve_editnurb_free(newob);
        curve_delete_segments(oldob, true);
 
-       DAG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
-       DAG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
+       DEG_id_tag_update(&oldob->id, OB_RECALC_DATA);  /* this is the original one */
+       DEG_id_tag_update(&newob->id, OB_RECALC_DATA);  /* this is the separated one */
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, oldob->data);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, newob);
@@ -1383,7 +1385,7 @@ static int curve_split_exec(bContext *C, wmOperator *op)
                        WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
        else {
                BKE_report(op->reports, RPT_ERROR, "Cannot split current selection");
@@ -2329,7 +2331,7 @@ static int switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
        if (ED_curve_updateAnimPaths(obedit->data))
                WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -2377,7 +2379,7 @@ static int set_goal_weight_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -2430,7 +2432,7 @@ static int set_radius_exec(bContext *C, wmOperator *op)
        }
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -2582,7 +2584,7 @@ static int smooth_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -2773,7 +2775,7 @@ static int curve_smooth_weight_exec(bContext *C, wmOperator *UNUSED(op))
        curve_smooth_value(editnurb, offsetof(BezTriple, weight), offsetof(BPoint, weight));
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -2801,7 +2803,7 @@ static int curve_smooth_radius_exec(bContext *C, wmOperator *UNUSED(op))
        curve_smooth_value(editnurb, offsetof(BezTriple, radius), offsetof(BPoint, radius));
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -2829,7 +2831,7 @@ static int curve_smooth_tilt_exec(bContext *C, wmOperator *UNUSED(op))
        curve_smooth_value(editnurb, offsetof(BezTriple, alfa), offsetof(BPoint, alfa));
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -2901,7 +2903,7 @@ static int hide_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
        BKE_curve_nurb_vert_active_validate(obedit->data);
 
@@ -2963,7 +2965,7 @@ static int reveal_exec(bContext *C, wmOperator *UNUSED(op))
                }
        }
 
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -3382,7 +3384,7 @@ static int subdivide_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -3577,7 +3579,7 @@ static int set_spline_type_exec(bContext *C, wmOperator *op)
                if (ED_curve_updateAnimPaths(obedit->data))
                        WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
                if (changed_size) {
@@ -3631,7 +3633,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
        BKE_nurbList_handles_set(editnurb, RNA_enum_get(op->ptr, "type"));
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -3676,7 +3678,7 @@ static int curve_normals_make_consistent_exec(bContext *C, wmOperator *op)
        BKE_nurbList_handles_recalculate(editnurb, calc_length, SELECT);
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -4064,7 +4066,7 @@ static int merge_nurb(bContext *C, wmOperator *op)
        BKE_curve_nurb_active_set(obedit->data, NULL);
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        
        return OPERATOR_FINISHED;
 }
@@ -4271,7 +4273,7 @@ static int make_segment_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -4515,7 +4517,7 @@ static int spin_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -4970,7 +4972,7 @@ static int add_vertex_exec(bContext *C, wmOperator *op)
                }
 
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -5125,7 +5127,7 @@ static int curve_extrude_exec(bContext *C, wmOperator *UNUSED(op))
                }
 
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
 
        return OPERATOR_FINISHED;
@@ -5224,7 +5226,7 @@ static int toggle_cyclic_exec(bContext *C, wmOperator *op)
        }
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -5742,7 +5744,7 @@ static int curve_delete_exec(bContext *C, wmOperator *op)
                if (ED_curve_updateAnimPaths(obedit->data)) WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
 
                return retval;
        }
@@ -5886,7 +5888,7 @@ static int curve_dissolve_exec(bContext *C, wmOperator *UNUSED(op))
                if (ED_curve_updateAnimPaths(obedit->data)) WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, obedit);
 
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
 
        return OPERATOR_FINISHED;
@@ -5927,7 +5929,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
        }
        
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -6053,9 +6055,9 @@ int join_curve_exec(bContext *C, wmOperator *op)
        /* Account for mixed 2D/3D curves when joining */
        BKE_curve_curve_dimension_update(cu);
 
-       DAG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
+       DEG_relations_tag_update(bmain);   // because we removed object(s), call before editmode!
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
        WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
@@ -6095,7 +6097,7 @@ static int clear_tilt_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        return OPERATOR_FINISHED;
 }
index cc8e272d4f78a73a63c3e7ba2bd3ea185d0cb1a2..281f6c3c22e7650b3b1df643c93a81b922d56621 100644 (file)
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_library.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "WM_api.h"
@@ -502,7 +503,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
                                cu->flag |= CU_PATH | CU_3D;
                }
                else {
-                       DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
                }
        }
        else { /* adding surface */
@@ -512,7 +513,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
                        newob = true;
                }
                else {
-                       DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
                }
        }
 
index 867aec61922e423003411c8ddcdeaeac812b26d1..e9d214157c0f25897b6f57146a8f83a43615b412 100644 (file)
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -1123,7 +1124,7 @@ static int curve_draw_exec(bContext *C, wmOperator *op)
        cu->actvert = nu->pntsu - 1;
 
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
 
        curve_draw_exit(op);
 
index 09a76553b2e7ab4406c9484eefafa562676bd49f..c18f1408387fdf4b993adf2c804c8aa58d30cd4f 100644 (file)
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -254,7 +255,7 @@ static void text_update_edited(bContext *C, Object *obedit, int mode)
        /* run update first since it can move the cursor */
        if (mode == FO_EDIT) {
                /* re-tesselllate */
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
        else {
                /* depsgraph runs above, but since we're not tagging for update, call direct */
@@ -585,7 +586,7 @@ static int set_style(bContext *C, const int style, const bool clear)
                        ef->textbufinfo[i].flag |= style;
        }
 
-       DAG_id_tag_update(obedit->data, 0);
+       DEG_id_tag_update(obedit->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
index 3d5317b2ebdba1a3a0c502ac84b0499262da24b9..587c25031ab256bc1c2c93586edadfb8a862c565 100644 (file)
@@ -24,6 +24,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../imbuf
        ../../gpu
        ../../makesdna
index 8c98d57009672b18eb78a7e50b74cbd95ded30d0..a4e5a90853174ed6b876f69f3c06a337b9e82ba1 100644 (file)
@@ -59,7 +59,6 @@
 #include "BKE_collection.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_gpencil.h"
@@ -71,6 +70,8 @@
 #include "BKE_screen.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 
 #include "WM_api.h"
@@ -548,7 +549,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
        WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
        
        /* send updates */
-       DAG_id_tag_update(&cu->id, 0);
+       DEG_id_tag_update(&cu->id, 0);
 }
 
 #undef MIN_TIME_DELTA
index c57f8d5c7a8f0c8205e60cd9c29390ca8ddf5cc4..748849f1aa5e5d6b203dfcf943d28a5fa85b9169 100644 (file)
@@ -24,6 +24,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../gpu
        ../../imbuf
        ../../makesdna
index a04360b3395d0da93566193971dede440c03ab2c..812f4ef074756e1299c96e5fe9caa275faaad6ce 100644 (file)
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_nla.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "ED_keyframing.h"
 
 #include "UI_interface.h"
@@ -211,7 +212,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str)
 
                        /* updates */
                        driver->flag |= DRIVER_FLAG_RECOMPILE;
-                       DAG_relations_tag_update(CTX_data_main(C));
+                       DEG_relations_tag_update(CTX_data_main(C));
                        WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME, NULL);
                        ok = true;
                }
index 858c21dfdda44139620583253cfaa191a89792c4..a1ba937d9252210beb47078d7ebccd379c7953f0 100644 (file)
 #include "BKE_screen.h"
 #include "BKE_report.h"
 #include "BKE_animsys.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idcode.h"
 #include "BKE_unit.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -1205,8 +1207,8 @@ static void driverdropper_sample(bContext *C, wmOperator *op, const wmEvent *eve
                        if (success) {
                                /* send updates */
                                UI_context_update_anim_flag(C);
-                               DAG_relations_tag_update(CTX_data_main(C));
-                               DAG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
+                               DEG_relations_tag_update(CTX_data_main(C));
+                               DEG_id_tag_update(ddr->ptr.id.data, OB_RECALC_OB | OB_RECALC_DATA);
                                WM_event_add_notifier(C, NC_ANIMATION | ND_FCURVES_ORDER, NULL);  // XXX
                        }
                }
index 09388ff1a18c6d4d87d34dd8bd8433957819e5cb..e47088d020eebd68532d79737b07421bd849c903 100644 (file)
@@ -42,7 +42,6 @@
 #include "BLT_lang.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_idprop.h"
 #include "BKE_layer.h"
 #include "BKE_screen.h"
@@ -51,6 +50,8 @@
 #include "BKE_text.h" /* for UI_OT_reports_to_text */
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_types.h"
@@ -396,7 +397,7 @@ static int use_property_button_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        /* TODO(sergey): Use proper flag for tagging here. */
-       DAG_id_tag_update((ID *)CTX_data_scene(C), 0);
+       DEG_id_tag_update((ID *)CTX_data_scene(C), 0);
 
        return OPERATOR_FINISHED;
 }
@@ -431,7 +432,7 @@ static int unuse_property_button_exec(bContext *C, wmOperator *UNUSED(op))
        IDP_FreeFromGroup(props, prop_to_remove);
 
        /* TODO(sergey): Use proper flag for tagging here. */
-       DAG_id_tag_update((ID *)CTX_data_scene(C), 0);
+       DEG_id_tag_update((ID *)CTX_data_scene(C), 0);
 
        return OPERATOR_FINISHED;
 }
index dbef5b68a03eedcd1bf900d0bec86359289cf173..39294265bca681d58fcfed63114a6c6c6e9cee93 100644 (file)
@@ -55,7 +55,6 @@
 
 #include "BKE_colortools.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idcode.h"
 #include "BKE_idprop.h"
@@ -73,6 +72,9 @@
 #include "BKE_screen.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 #include "ED_render.h"
@@ -398,13 +400,13 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event)
                                        Scene *scene = CTX_data_scene(C);
                                        ED_object_single_user(bmain, scene, (struct Object *)id);
                                        WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
-                                       DAG_relations_tag_update(bmain);
+                                       DEG_relations_tag_update(bmain);
                                }
                                else {
                                        if (id) {
                                                Main *bmain = CTX_data_main(C);
                                                id_single_user(C, id, &template->ptr, template->prop);
-                                               DAG_relations_tag_update(bmain);
+                                               DEG_relations_tag_update(bmain);
                                        }
                                }
                        }
@@ -1045,7 +1047,7 @@ static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v)
        ob->partype = PAROBJECT;
 
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        ED_undo_push(C, "Modifier convert to real");
 }
@@ -1326,7 +1328,7 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
                        Main *bmain = CTX_data_main(C);
                        if (ob->pose)
                                BKE_pose_tag_recalc(bmain, ob->pose); /* checks & sorts pose channels */
-                       DAG_relations_tag_update(bmain);
+                       DEG_relations_tag_update(bmain);
                        break;
                }
 #endif
@@ -1340,8 +1342,8 @@ static void do_constraint_panels(bContext *C, void *ob_pt, int event)
         * object_test_constraints(ob);
         * if (ob->pose) BKE_pose_update_constraint_flags(ob->pose); */
        
-       if (ob->type == OB_ARMATURE) DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
-       else DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+       if (ob->type == OB_ARMATURE) DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+       else DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, ob);
 }
index 033d034cf4e5ac406904cfcdc41019048fce30e4..d17df344dc974ca52a4808a84bedb3a87ee57408 100644 (file)
@@ -25,6 +25,7 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
+       ../../depsgraph
        ../../gpu
        ../../makesdna
        ../../makesrna
index 69335195b96825a5f9e8c5534abdee6fd5ce8636..ad1a567f843e64362871a58216f004ad0120f38b 100644 (file)
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_mask_types.h"
@@ -692,7 +693,7 @@ static int add_feather_vertex_exec(bContext *C, wmOperator *op)
 
                WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
index 35de390274c5e21d13538791a164c66c2744a9b9..7bd8d9de278f0c9834079d34dd525c41a7439001 100644 (file)
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_mask.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_scene_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h"  /* SELECT */
@@ -1062,7 +1063,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
                        }
 
                        WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-                       DAG_id_tag_update(&data->mask->id, 0);
+                       DEG_id_tag_update(&data->mask->id, 0);
 
                        break;
                }
@@ -1089,7 +1090,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
                                }
 
                                WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-                               DAG_id_tag_update(&data->mask->id, 0);
+                               DEG_id_tag_update(&data->mask->id, 0);
 
                                free_slide_point_data(op->customdata); /* keep this last! */
                                return OPERATOR_FINISHED;
@@ -1105,7 +1106,7 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
                        cancel_slide_point(op->customdata);
 
                        WM_event_add_notifier(C, NC_MASK | NA_EDITED, data->mask);
-                       DAG_id_tag_update(&data->mask->id, 0);
+                       DEG_id_tag_update(&data->mask->id, 0);
 
                        free_slide_point_data(op->customdata); /* keep this last! */
                        return OPERATOR_CANCELLED;
@@ -1469,7 +1470,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
                        }
 
                        WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-                       DAG_id_tag_update(&slide_data->mask->id, 0);
+                       DEG_id_tag_update(&slide_data->mask->id, 0);
 
                        break;
                }
@@ -1483,7 +1484,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
                                }
 
                                WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-                               DAG_id_tag_update(&slide_data->mask->id, 0);
+                               DEG_id_tag_update(&slide_data->mask->id, 0);
 
                                free_slide_spline_curvature_data(slide_data); /* keep this last! */
                                return OPERATOR_FINISHED;
@@ -1495,7 +1496,7 @@ static int slide_spline_curvature_modal(bContext *C, wmOperator *op, const wmEve
                        cancel_slide_spline_curvature(slide_data);
 
                        WM_event_add_notifier(C, NC_MASK | NA_EDITED, slide_data->mask);
-                       DAG_id_tag_update(&slide_data->mask->id, 0);
+                       DEG_id_tag_update(&slide_data->mask->id, 0);
 
                        free_slide_spline_curvature_data(op->customdata); /* keep this last! */
                        return OPERATOR_CANCELLED;
@@ -1541,7 +1542,7 @@ static int cyclic_toggle_exec(bContext *C, wmOperator *UNUSED(op))
                }
        }
 
-       DAG_id_tag_update(&mask->id, 0);
+       DEG_id_tag_update(&mask->id, 0);
        WM_event_add_notifier(C, NC_MASK | NA_EDITED, mask);
 
        return OPERATOR_FINISHED;
@@ -1900,7 +1901,7 @@ static int set_handle_type_exec(bContext *C, wmOperator *op)
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -1954,7 +1955,7 @@ static int mask_hide_view_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -2016,7 +2017,7 @@ static int mask_hide_view_set_exec(bContext *C, wmOperator *op)
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -2076,7 +2077,7 @@ static int mask_feather_weight_clear_exec(bContext *C, wmOperator *UNUSED(op))
                BKE_mask_update_display(mask, CFRA);
 
                WM_event_add_notifier(C, NC_MASK | ND_DRAW, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
index 4e0aa8f84ae12f1696481e540477df1d571a852d..c500ec75aeea93c6646ff7a192a03b832c90740c 100644 (file)
 #include "BLI_string.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_mask_types.h"
 
 #include "WM_api.h"
@@ -73,7 +74,7 @@ static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-       DAG_id_tag_update(&mask->id, 0);
+       DEG_id_tag_update(&mask->id, 0);
 
        return OPERATOR_FINISHED;
 }
@@ -176,7 +177,7 @@ static int mask_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-       DAG_id_tag_update(&mask->id, 0);
+       DEG_id_tag_update(&mask->id, 0);
 
        return OPERATOR_FINISHED;
 }
index 99ffc9cd7d2658dae64aebca5d04e8686190f747..3fb1cc87dbd23126e44bb4b4cd4916cb77d0f910 100644 (file)
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
 #include "DNA_object_types.h"
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -75,7 +76,7 @@ static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -124,7 +125,7 @@ static int mask_shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-               DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&mask->id, OB_RECALC_DATA);
 
                return OPERATOR_FINISHED;
        }
@@ -216,7 +217,7 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
@@ -386,7 +387,7 @@ static int mask_shape_key_rekey_exec(bContext *C, wmOperator *op)
 
        if (changed) {
                WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
-               DAG_id_tag_update(&mask->id, 0);
+               DEG_id_tag_update(&mask->id, 0);
 
                return OPERATOR_FINISHED;
        }
index 8783367ef7ef522175b8ac96f0567367d2c640a9..4607ed79c3b2714b4048723e7521069c5c04a2a2 100644 (file)
@@ -24,6 +24,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../bmesh
        ../../gpu
        ../../imbuf
index 077c0ca37bdf589b1f861124c2cdb30cb1d1d57e..cbed6a37c1f17881fe3721e95c4b584b9e6f14e9 100644 (file)
 #include "BKE_material.h"
 #include "BKE_context.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_report.h"
 #include "BKE_texture.h"
 #include "BKE_main.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "BLT_translation.h"
 
 #include "RNA_define.h"
@@ -2449,7 +2451,7 @@ static void shape_propagate(BMEditMesh *em, wmOperator *op)
        //TAG Mesh Objects that share this data
        for (base = scene->base.first; base; base = base->next) {
                if (base->object && base->object->data == me) {
-                       DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                }
        }
 #endif
@@ -3355,7 +3357,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
                                        if (retval_iter) {
                                                BM_mesh_bm_to_me(bm_old, me, (&(struct BMeshToMeshParams){0}));
 
-                                               DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&me->id, OB_RECALC_DATA);
                                                WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
                                        }
 
@@ -3370,7 +3372,7 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 
        if (retval) {
                /* delay depsgraph recalc until all objects are duplicated */
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
 
                return OPERATOR_FINISHED;
@@ -5888,7 +5890,7 @@ static int edbm_mark_freestyle_edge_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
+       DEG_id_tag_update(obedit->data, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -5952,7 +5954,7 @@ static int edbm_mark_freestyle_face_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
+       DEG_id_tag_update(obedit->data, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
index 7300d6f4e52fdfa9fc9f626fdb49325d5a1b3856..555fe6c917d90056230780d04af63813f065779b 100644 (file)
@@ -44,7 +44,6 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_context.h"
 #include "BKE_global.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
@@ -52,6 +51,8 @@
 #include "BKE_editmesh.h"
 #include "BKE_editmesh_bvh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BKE_object.h"  /* XXX. only for EDBM_mesh_ensure_valid_dm_hack() which will be removed */
 
 #include "WM_api.h"
@@ -116,7 +117,7 @@ void EDBM_mesh_ensure_valid_dm_hack(Scene *scene, BMEditMesh *em)
        {
                /* since we may not have done selection flushing */
                if ((em->ob->recalc & OB_RECALC_DATA) == 0) {
-                       DAG_id_tag_update(&em->ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&em->ob->id, OB_RECALC_DATA);
                }
                BKE_object_handle_update(G.main->eval_ctx, scene, em->ob);
        }
@@ -1276,7 +1277,7 @@ void EDBM_update_generic(BMEditMesh *em, const bool do_tessface, const bool is_d
 {
        Object *ob = em->ob;
        /* order of calling isn't important */
-       DAG_id_tag_update(ob->data, OB_RECALC_DATA);
+       DEG_id_tag_update(ob->data, OB_RECALC_DATA);
        WM_main_add_notifier(NC_GEOM | ND_DATA, ob->data);
 
        if (do_tessface) {
index 333c8b29667f38ea802099fba06d9ce19654fc0b..49755c75480095863a9e59bb6f2a8374e13b7887 100644 (file)
@@ -42,7 +42,6 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_mesh.h"
@@ -50,6 +49,8 @@
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_define.h"
 
 #include "WM_api.h"
@@ -245,7 +246,7 @@ void ED_mesh_uv_loop_reset_ex(struct Mesh *me, const int layernum)
                }
        }
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
 }
 
 void ED_mesh_uv_loop_reset(struct bContext *C, struct Mesh *me)
@@ -314,7 +315,7 @@ int ED_mesh_uv_texture_add(Mesh *me, const char *name, const bool active_set)
                ED_mesh_uv_loop_reset_ex(me, layernum_dst);
        }
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
        return layernum_dst;
@@ -354,7 +355,7 @@ bool ED_mesh_uv_texture_remove_index(Mesh *me, const int n)
 
        delete_customdata_layer(me, cdlu);
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
        return true;
@@ -433,7 +434,7 @@ int ED_mesh_color_add(Mesh *me, const char *name, const bool active_set)
                BKE_mesh_update_customdata_pointers(me, true);
        }
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
        return layernum;
@@ -452,7 +453,7 @@ bool ED_mesh_color_remove_index(Mesh *me, const int n)
                return false;
 
        delete_customdata_layer(me, cdl);
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        WM_main_add_notifier(NC_GEOM | ND_DATA, me);
 
        return true;
@@ -573,7 +574,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, const wmEvent *e
 
                /* load_editMesh free's pointers used by CustomData layers which might be used by DerivedMesh too,
                 * so signal to re-create DerivedMesh here (sergey) */
-               DAG_id_tag_update(&me->id, 0);
+               DEG_id_tag_update(&me->id, 0);
        }
 
        /* dummie drop support; ensure view shows a result :) */
@@ -712,7 +713,7 @@ static int mesh_customdata_clear_exec__internal(bContext *C,
                        CustomData_free_layers(data, type, tot);
                }
 
-               DAG_id_tag_update(&me->id, 0);
+               DEG_id_tag_update(&me->id, 0);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
                return OPERATOR_FINISHED;
@@ -808,7 +809,7 @@ static int mesh_customdata_skin_add_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_mesh_ensure_skin_customdata(me);
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
        return OPERATOR_FINISHED;
@@ -870,7 +871,7 @@ static int mesh_customdata_custom_splitnormals_add_exec(bContext *C, wmOperator
                        CustomData_add_layer(data, CD_CUSTOMLOOPNORMAL, CD_DEFAULT, NULL, me->totloop);
                }
 
-               DAG_id_tag_update(&me->id, 0);
+               DEG_id_tag_update(&me->id, 0);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
 
                return OPERATOR_FINISHED;
@@ -947,7 +948,7 @@ void ED_mesh_update(Mesh *mesh, bContext *C, int calc_edges, int calc_tessface)
 
        BKE_mesh_calc_normals(mesh);
 
-       DAG_id_tag_update(&mesh->id, 0);
+       DEG_id_tag_update(&mesh->id, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, mesh);
 }
 
index 443f2f0baa8f1f79654b875aa1b8e6a27895d0ce..57a8da5e18d2fb6f4a2ac8e8172e70fde3678382 100644 (file)
@@ -41,7 +41,6 @@
 #include "BLI_linklist.h"
 
 #include "BKE_library.h"
-#include "BKE_depsgraph.h"
 #include "BKE_context.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"
@@ -440,7 +439,7 @@ static Object *createRepresentation(bContext *C, struct recast_polyMesh *pmesh,
        recast_destroyPolyMesh(pmesh);
        recast_destroyPolyMeshDetail(dmesh);
 
-       DAG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
+       DEG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
 
@@ -552,7 +551,7 @@ static int navmesh_face_copy_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
+       DEG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -633,7 +632,7 @@ static int navmesh_face_add_exec(bContext *C, wmOperator *UNUSED(op))
                }
        }
 
-       DAG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
+       DEG_id_tag_update((ID *)obedit->data, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
 
        return OPERATOR_FINISHED;
@@ -682,7 +681,7 @@ static int navmesh_reset_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_mesh_ensure_navmesh(me);
 
-       DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&me->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, &me->id);
 
        return OPERATOR_FINISHED;
@@ -710,7 +709,7 @@ static int navmesh_clear_exec(bContext *C, wmOperator *UNUSED(op))
 
        CustomData_free_layers(&me->pdata, CD_RECAST, me->totpoly);
 
-       DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&me->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, &me->id);
 
        return OPERATOR_FINISHED;
index 8727511035e1c1d87411f2d56e32a4a8a3a7d2b6..e7b1f925d5eb66f4115f2c5ea0d6f2c6425bb9b6 100644 (file)
@@ -49,7 +49,6 @@
 
 #include "BLI_kdtree.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_deform.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_key.h"
@@ -62,6 +61,9 @@
 #include "BKE_editmesh.h"
 #include "BKE_multires.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_view3d.h"
@@ -604,9 +606,9 @@ int join_mesh_exec(bContext *C, wmOperator *op)
        /* Due to dependnecy cycle some other object might access old derived data. */
        BKE_object_free_derived_caches(ob);
 
-       DAG_relations_tag_update(bmain);   /* removed objects, need to rebuild dag */
+       DEG_relations_tag_update(bmain);   /* removed objects, need to rebuild dag */
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
        WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
index 0f9de8dbf87a2d7eb0c122f8c06204ae6b513ad1..89ba942ac365f3fa728b09c2dad3700c9fcfdf90 100644 (file)
@@ -22,6 +22,7 @@ set(INC
        ../include
        ../../blenkernel
        ../../blenlib
+       ../../depsgraph
        ../../makesdna
        ../../makesrna
        ../../render/extern/include
index bc42717b69fb3b557659e05d34a0e40960b2115d..bb0a3234b43ed5361894548085087e8a0020b063 100644 (file)
 #include "RNA_define.h"
 #include "RNA_access.h"
 
-#include "BKE_depsgraph.h"
 #include "BKE_context.h"
 #include "BKE_mball.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_mball.h"
 #include "ED_screen.h"
 #include "ED_view3d.h"
@@ -433,7 +434,7 @@ static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
                        ml = ml->prev;
                }
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
 
        return OPERATOR_FINISHED;
@@ -475,7 +476,7 @@ static int delete_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
                        ml = next;
                }
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
 
        return OPERATOR_FINISHED;
@@ -515,7 +516,7 @@ static int hide_metaelems_exec(bContext *C, wmOperator *op)
                        ml = ml->next;
                }
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
 
        return OPERATOR_FINISHED;
@@ -556,7 +557,7 @@ static int reveal_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
                        ml = ml->next;
                }
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, mb);
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
        }
        
        return OPERATOR_FINISHED;
index 068caee4e1ae04a669c552b52ac7753775fabe8f..3c64117a2d87bb21eeafe43d5f0a4a051d490077 100644 (file)
@@ -67,7 +67,6 @@
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_displist.h"
 #include "BKE_effect.h"
@@ -94,6 +93,9 @@
 #include "BKE_speaker.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -433,8 +435,8 @@ Object *ED_object_add_type(
                ob->gameflag &= ~(OB_SENSOR | OB_RIGID_BODY | OB_SOFT_BODY | OB_COLLISION | OB_CHARACTER | OB_OCCLUDER | OB_DYNAMIC | OB_NAVMESH); /* copied from rna_object.c */
        }
 
-       DAG_id_type_tag(bmain, ID_OB);
-       DAG_relations_tag_update(bmain);
+       DEG_id_type_tag(bmain, ID_OB);
+       DEG_relations_tag_update(bmain);
        if (ob->data) {
                ED_render_id_flush_update(bmain, ob->data);
        }
@@ -445,7 +447,7 @@ Object *ED_object_add_type(
        WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
 
        /* TODO(sergey): Use proper flag for tagging here. */
-       DAG_id_tag_update(&scene->id, 0);
+       DEG_id_tag_update(&scene->id, 0);
 
        return ob;
 }
@@ -541,7 +543,7 @@ static int effector_add_exec(bContext *C, wmOperator *op)
 
        ob->pd = object_add_collision_fields(type);
 
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_relations_tag_update(CTX_data_main(C));
 
        return OPERATOR_FINISHED;
 }
@@ -646,7 +648,7 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
                newob = true;
        }
        else {
-               DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
        }
 
        ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
@@ -750,7 +752,7 @@ static int object_armature_add_exec(bContext *C, wmOperator *op)
                newob = true;
        }
        else {
-               DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
        }
 
        if (obedit == NULL) {
@@ -1008,7 +1010,7 @@ static int group_instance_add_exec(bContext *C, wmOperator *op)
                id_us_plus(&group->id);
 
                /* works without this except if you try render right after, see: 22027 */
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
 
                WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
 
@@ -1128,7 +1130,7 @@ void ED_base_object_free_and_unlink(Main *bmain, Scene *scene, Object *ob)
 
        object_delete_check_glsl_update(ob);
        BKE_collections_object_remove(bmain, scene, ob, true);
-       DAG_id_type_tag(bmain, ID_OB);
+       DEG_id_type_tag(bmain, ID_OB);
 }
 
 static int object_delete_exec(bContext *C, wmOperator *op)
@@ -1215,7 +1217,7 @@ static int object_delete_exec(bContext *C, wmOperator *op)
                if (scene->id.tag & LIB_TAG_DOIT) {
                        scene->id.tag &= ~LIB_TAG_DOIT;
                        
-                       DAG_relations_tag_update(bmain);
+                       DEG_relations_tag_update(bmain);
 
                        WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
                        WM_event_add_notifier(C, NC_SCENE | ND_LAYER_CONTENT, scene);
@@ -1408,7 +1410,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                set_sca_new_poins_ob(ob);
                BKE_id_clear_newpoin(&dob->ob->id);
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
 
        if (use_hierarchy) {
@@ -1462,7 +1464,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                                BKE_object_apply_mat4(ob_dst, dob->mat, false, true);
 
                                /* to set ob_dst->orig and in case theres any other discrepicies */
-                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
+                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
                        }
                }
        }
@@ -1479,7 +1481,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                        /* similer to the code above, see comments */
                        invert_m4_m4(ob_dst->parentinv, dob->mat);
                        BKE_object_apply_mat4(ob_dst, dob->mat, false, true);
-                       DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB);
                }
        }
 
@@ -1488,7 +1490,7 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
                        if (object->proxy_group == base->object) {
                                object->proxy = NULL;
                                object->proxy_from = NULL;
-                               DAG_id_tag_update(&object->id, OB_RECALC_OB);
+                               DEG_id_tag_update(&object->id, OB_RECALC_OB);
                        }
                }
        }
@@ -1522,7 +1524,7 @@ static int object_duplicates_make_real_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_SCENE, scene);
        WM_main_add_notifier(NC_OBJECT | ND_DRAW, NULL);
 
@@ -1605,7 +1607,7 @@ static Base *duplibase_for_convert(Main *bmain, Scene *scene, SceneLayer *sl, Ba
        }
 
        obn = BKE_object_copy(bmain, ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
        BKE_collection_object_add_from(scene, ob, obn);
 
        basen = BKE_scene_layer_base_find(sl, obn);
@@ -1665,7 +1667,7 @@ static int convert_exec(bContext *C, wmOperator *op)
        {
                for (CollectionPointerLink *link = selected_editable_bases.first; link; link = link->next) {
                        Base *base = link->ptr.data;
-                       DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                }
 
                uint64_t customdata_mask_prev = scene->customdata_mask;
@@ -1734,7 +1736,7 @@ static int convert_exec(bContext *C, wmOperator *op)
                        }
                        else {
                                newob = ob;
-                               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                        }
 
                        /* make new mesh data from the original copy */
@@ -1800,7 +1802,7 @@ static int convert_exec(bContext *C, wmOperator *op)
                                        for (ob1 = bmain->object.first; ob1; ob1 = ob1->id.next) {
                                                if (ob1->data == ob->data) {
                                                        ob1->type = OB_CURVE;
-                                                       DAG_id_tag_update(&ob1->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                                       DEG_id_tag_update(&ob1->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                                }
                                        }
                                }
@@ -1902,7 +1904,7 @@ static int convert_exec(bContext *C, wmOperator *op)
                }
 
                if (!keep_original && (ob->flag & OB_DONE)) {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        ((ID *)ob->data)->tag &= ~LIB_TAG_DOIT; /* flag not to convert this datablock again */
                }
        }
@@ -1927,7 +1929,7 @@ static int convert_exec(bContext *C, wmOperator *op)
                }
 
                /* delete object should renew depsgraph */
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
        }
 
 // XXX ED_object_editmode_enter(C, 0);
@@ -1943,7 +1945,7 @@ static int convert_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_OBJECT | ND_DATA, BASACT_NEW->object);
        }
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, scene);
        WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
@@ -1998,7 +2000,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer
        }
        else {
                obn = ID_NEW_SET(ob, BKE_object_copy(bmain, ob));
-               DAG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+               DEG_id_tag_update(&obn->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                BKE_collection_object_add_from(scene, ob, obn);
                basen = BKE_scene_layer_base_find(sl, obn);
@@ -2120,7 +2122,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, SceneLayer
                                }
                                break;
                        case OB_ARMATURE:
-                               DAG_id_tag_update(&obn->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&obn->id, OB_RECALC_DATA);
                                if (obn->pose)
                                        BKE_pose_tag_recalc(bmain, obn->pose);
                                if (dupflag & USER_DUP_ARM) {
@@ -2277,7 +2279,7 @@ static int duplicate_exec(bContext *C, wmOperator *op)
                        ED_object_base_activate(C, basen);
 
                if (basen->object->data) {
-                       DAG_id_tag_update(basen->object->data, 0);
+                       DEG_id_tag_update(basen->object->data, 0);
                }
        }
        CTX_DATA_END;
@@ -2286,9 +2288,9 @@ static int duplicate_exec(bContext *C, wmOperator *op)
 
        BKE_main_id_clear_newpoins(bmain);
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        /* TODO(sergey): Use proper flag for tagging here. */
-       DAG_id_tag_update(&CTX_data_scene(C)->id, 0);
+       DEG_id_tag_update(&CTX_data_scene(C)->id, 0);
 
        WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT, scene);
 
@@ -2369,7 +2371,7 @@ static int add_named_exec(bContext *C, wmOperator *op)
 
        BKE_main_id_clear_newpoins(bmain);
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        WM_event_add_notifier(C, NC_SCENE | ND_OB_SELECT | ND_OB_ACTIVE, scene);
 
index 92a3850f2f3d745ba78840643f9102032b94d0eb..e3dd47295fe05632a424309a30902d9cca62d343 100644 (file)
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 #include "RE_multires_bake.h"
@@ -688,7 +689,7 @@ static void finish_bake_internal(BakeRender *bkr)
                        }
 
                        BKE_image_release_ibuf(ima, ibuf, NULL);
-                       DAG_id_tag_update(&ima->id, 0);                 
+                       DEG_id_tag_update(&ima->id, 0);                 
                }
        }
 
@@ -698,7 +699,7 @@ static void finish_bake_internal(BakeRender *bkr)
                BLI_assert(BLI_thread_is_main());
                for (me = G.main->mesh.first; me; me = me->id.next) {
                        if (me->id.tag & LIB_TAG_DOIT) {
-                               DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&me->id, OB_RECALC_DATA);
                                BKE_mesh_tessface_clear(me);
                        }
                }
index a4aff5b10f364b057ac8ebb079b47d6c2dd55fc3..990761e233a24db2fbf98ce3d7f9c46f24faefb6 100644 (file)
@@ -57,7 +57,6 @@
 #include "BKE_modifier.h"
 #include "BKE_mesh.h"
 #include "BKE_screen.h"
-#include "BKE_depsgraph.h"
 
 #include "DEG_depsgraph.h"
 
@@ -275,7 +274,7 @@ static void refresh_images(BakeImages *bake_images)
                Image *ima = bake_images->data[i].image;
                if (ima->ok == IMA_OK_LOADED) {
                        GPU_free_image(ima);
-                       DAG_id_tag_update(&ima->id, 0);         
+                       DEG_id_tag_update(&ima->id, 0);         
                }
        }
 }
index 2437a6bff2812f8c382e2867580737350d6a66fe..d110400de8062b842bf77610088a1bb6cdf80fd4 100644 (file)
@@ -53,7 +53,6 @@
 #include "BKE_armature.h"
 #include "BKE_constraint.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -62,6 +61,9 @@
 #include "BKE_tracking.h"
 #include "BIK_api.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
@@ -1196,9 +1198,9 @@ void ED_object_constraint_update(Object *ob)
        object_test_constraints(ob);
 
        if (ob->type == OB_ARMATURE) 
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
        else 
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 static void object_pose_tag_update(Main *bmain, Object *ob)
@@ -1221,7 +1223,7 @@ void ED_object_constraint_dependency_update(Main *bmain, Object *ob)
        if (ob->pose) {
                object_pose_tag_update(bmain, ob);
        }
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 }
 
 void ED_object_constraint_tag_update(Object *ob, bConstraint *con)
@@ -1233,9 +1235,9 @@ void ED_object_constraint_tag_update(Object *ob, bConstraint *con)
        object_test_constraint(ob, con);
 
        if (ob->type == OB_ARMATURE)
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
        else
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 void ED_object_constraint_dependency_tag_update(Main *bmain, Object *ob, bConstraint *con)
@@ -1245,7 +1247,7 @@ void ED_object_constraint_dependency_tag_update(Main *bmain, Object *ob, bConstr
        if (ob->pose) {
                object_pose_tag_update(bmain, ob);
        }
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 }
 
 static int constraint_poll(bContext *C)
@@ -1269,7 +1271,7 @@ static int constraint_delete_exec(bContext *C, wmOperator *UNUSED(op))
                ED_object_constraint_update(ob); /* needed to set the flags on posebones correctly */
 
                /* relatiols */
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_relations_tag_update(CTX_data_main(C));
 
                /* notifiers */
                WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
@@ -1411,12 +1413,12 @@ static int pose_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
        CTX_DATA_END;
        
        /* force depsgraph to get recalculated since relationships removed */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        
        /* note, calling BIK_clear_data() isn't needed here */
 
        /* do updates */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
        
        return OPERATOR_FINISHED;
@@ -1443,12 +1445,12 @@ static int object_constraints_clear_exec(bContext *C, wmOperator *UNUSED(op))
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
        {
                BKE_constraints_free(&ob->constraints);
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;
        
        /* force depsgraph to get recalculated since relationships removed */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        
        /* do updates */
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, NULL);
@@ -1496,13 +1498,13 @@ static int pose_constraint_copy_exec(bContext *C, wmOperator *op)
                        chan->constflag |= pchan->constflag;
 
                        BKE_pose_tag_recalc(bmain, ob->pose);
-                       DAG_id_tag_update((ID *)ob, OB_RECALC_DATA);
+                       DEG_id_tag_update((ID *)ob, OB_RECALC_DATA);
                }
        }
        BLI_freelistN(&lb);
        
        /* force depsgraph to get recalculated since new relationships added */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT, NULL);
        
@@ -1535,13 +1537,13 @@ static int object_constraint_copy_exec(bContext *C, wmOperator *UNUSED(op))
                /* if we're not handling the object we're copying from, copy all constraints over */
                if (obact != ob) {
                        BKE_constraints_copy(&ob->constraints, &obact->constraints, true);
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
        }
        CTX_DATA_END;
        
        /* force depsgraph to get recalculated since new relationships added */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        
        /* notifiers for updates */
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_ADDED, NULL);
@@ -1818,7 +1820,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 
 
        /* force depsgraph to get recalculated since new relationships added */
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        
        if ((ob->type == OB_ARMATURE) && (pchan)) {
                BKE_pose_tag_recalc(bmain, ob->pose);  /* sort pose channels */
@@ -1828,10 +1830,10 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
                         * XXX Temp hack until new depsgraph hopefully solves this. */
                        ob->adt->recalc |= ADT_RECALC_ANIM;
                }
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA | OB_RECALC_OB);
        }
        else
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        
        /* notifiers for updates */
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_ADDED, ob);
@@ -2071,7 +2073,7 @@ static int pose_ik_clear_exec(bContext *C, wmOperator *UNUSED(op))
        CTX_DATA_END;
        
        /* refresh depsgraph */
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        /* note, notifier might evolve */
        WM_event_add_notifier(C, NC_OBJECT | ND_CONSTRAINT | NA_REMOVED, ob);
index 250737a130c5d13ddf05cc01967681c56438ae57..9a89ec453fd2afe3f1076f3d9dafc3c4c4eed605 100644 (file)
 
 #include "BKE_context.h"
 #include "BKE_data_transfer.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_object.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -423,7 +424,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
                        }
                }
 
-               DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
 
                if (reverse_transfer) {
                        SWAP(Object *, ob_src, ob_dst);
@@ -641,7 +642,7 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
                BKE_object_data_transfer_layout(scene, ob_src, ob_dst, dtmd->data_types, use_delete,
                                                dtmd->layers_select_src, dtmd->layers_select_dst);
 
-               DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
        }
        else {
                Object *ob_src = ob_act;
@@ -672,7 +673,7 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
                                                                layers_select_src, layers_select_dst);
                        }
 
-                       DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
                }
 
                BLI_freelistN(&ctx_objects);
index fe232e378869e377acdbab4b78e47143525d4e39..f92540962903804fe72a3d514ee370c8a5f46e9d 100644 (file)
@@ -66,7 +66,6 @@
 #include "BKE_context.h"
 #include "BKE_curve.h"
 #include "BKE_effect.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_lattice.h"
@@ -85,6 +84,9 @@
 #include "BKE_report.h"
 #include "BKE_workspace.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_armature.h"
 #include "ED_curve.h"
 #include "ED_mesh.h"
@@ -194,7 +196,7 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
                 * to inform dependency graph about this. But is it really the
                 * best place to do this?
                 */
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
        }
        else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
                ED_curve_editnurb_load(obedit);
@@ -216,7 +218,7 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
        /* Tag update so no access to freed data referenced from
         * derived cache will happen.
         */
-       DAG_id_tag_update((ID *)obedit->data, 0);
+       DEG_id_tag_update((ID *)obedit->data, 0);
 
        return true;
 }
@@ -267,7 +269,7 @@ void ED_object_editmode_exit(bContext *C, int flag)
                BKE_ptcache_object_reset(scene, obedit, PTCACHE_RESET_OUTDATED);
 
                /* also flush ob recalc, doesn't take much overhead, but used for particles */
-               DAG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA);
+               DEG_id_tag_update(&obedit->id, OB_RECALC_OB | OB_RECALC_DATA);
        
                if (flag & EM_DO_UNDO)
                        ED_undo_push(C, "Editmode");
@@ -358,7 +360,7 @@ void ED_object_editmode_enter(bContext *C, int flag)
                scene->obedit = ob;
                ED_armature_to_edit(arm);
                /* to ensure all goes in restposition and without striding */
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); /* XXX: should this be OB_RECALC_DATA? */
 
                WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_ARMATURE, scene);
        }
@@ -392,7 +394,7 @@ void ED_object_editmode_enter(bContext *C, int flag)
        }
 
        if (ok) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        else {
                scene->obedit = NULL; /* XXX for context */
@@ -684,7 +686,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
        for (base = FIRSTBASE_NEW; base; base = base->next) {
                if (base != BASACT_NEW) {
                        if (TESTBASELIB_NEW(base)) {
-                               DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                                
                                if (event == 1) {  /* loc */
                                        copy_v3_v3(base->object->loc, ob->loc);
@@ -787,7 +789,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
                                                
                                                BLI_strncpy(cu1->family, cu->family, sizeof(cu1->family));
                                                
-                                               DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                                        }
                                }
                                else if (event == 19) {   /* bevel settings */
@@ -803,7 +805,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
                                                cu1->ext1 = cu->ext1;
                                                cu1->ext2 = cu->ext2;
                                                
-                                               DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                                        }
                                }
                                else if (event == 25) {   /* curve resolution */
@@ -822,7 +824,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
                                                        nu = nu->next;
                                                }
                                                
-                                               DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                                        }
                                }
                                else if (event == 21) {
@@ -838,7 +840,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
                                                        }
 
                                                        modifier_copyData(md, tmd);
-                                                       DAG_id_tag_update(&base->object->id, OB_RECALC_DATA);
+                                                       DEG_id_tag_update(&base->object->id, OB_RECALC_DATA);
                                                }
                                        }
                                }
@@ -899,7 +901,7 @@ static void copy_attr(Main *bmain, Scene *scene, SceneLayer *sl, short event)
        }
        
        if (do_depgraph_update)
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
 }
 
 static void UNUSED_FUNCTION(copy_attr_menu) (Main *bmain, Scene *scene, SceneLayer *sl)
@@ -1255,7 +1257,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
                if (ob->type == OB_MESH) {
                        BKE_mesh_smooth_flag_set(ob, !clear);
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
                        done = true;
@@ -1268,7 +1270,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
                                else nu->flag &= ~ME_SMOOTH;
                        }
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
                        done = true;
@@ -1366,7 +1368,7 @@ static void UNUSED_FUNCTION(image_aspect) (Scene *scene, SceneLayer *sl)
                                                                else ob->size[1] = ob->size[0] * y / x;
                                                                
                                                                done = true;
-                                                               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                                                               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
                                                                BKE_image_release_ibuf(tex->ima, ibuf, NULL);
                                                        }
index b8666fc7a65e07c9154dfb207ea7bc249e2368e2..87b59da6c62ee5ee77fdd1a6523d5318a72d894a 100644 (file)
@@ -38,7 +38,7 @@
 #include "BKE_object_facemap.h"
 #include "BKE_object_deform.h"
 
-#include "BKE_depsgraph.h"
+#include "DEG_depsgraph.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_path_util.h"
@@ -182,7 +182,7 @@ static int face_map_add_exec(bContext *C, wmOperator *UNUSED(op))
        Object *ob = ED_object_context(C);
 
        BKE_object_facemap_add(ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        
@@ -211,7 +211,7 @@ static int face_map_remove_exec(bContext *C, wmOperator *UNUSED(op))
        
        if (fmap) {
                BKE_object_facemap_remove(ob, fmap);
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
@@ -259,7 +259,7 @@ static int face_map_assign_exec(bContext *C, wmOperator *UNUSED(op))
                        }
                }
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
@@ -308,7 +308,7 @@ static int face_map_remove_from_exec(bContext *C, wmOperator *UNUSED(op))
                        }
                }
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
@@ -362,7 +362,7 @@ static int face_map_select_exec(bContext *C, wmOperator *UNUSED(op))
        if (fmap) {
                fmap_select(ob, true);
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
@@ -392,7 +392,7 @@ static int face_map_deselect_exec(bContext *C, wmOperator *UNUSED(op))
        if (fmap) {
                fmap_select(ob, false);
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
@@ -462,7 +462,7 @@ static int face_map_move_exec(bContext *C, wmOperator *op)
        
        ob->actfmap = pos2 + 1;
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 
        return OPERATOR_FINISHED;
index b22b034ecab16eecb5b8daffe256bd2e6870e159..9d06624bd9c2ec61ca64d722e1d653dfd0939492 100644 (file)
@@ -40,7 +40,6 @@
 #include "DNA_scene_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_group.h"
 #include "BKE_library.h"
 #include "BKE_library_remap.h"
@@ -48,6 +47,8 @@
 #include "BKE_report.h"
 #include "BKE_object.h"
 
+#include "DEG_depsgraph_build.h"
+
 #include "ED_screen.h"
 #include "ED_object.h"
 
@@ -166,7 +167,7 @@ static int objects_add_active_exec(bContext *C, wmOperator *op)
        if (!updated)
                return OPERATOR_CANCELLED;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
        return OPERATOR_FINISHED;
@@ -230,7 +231,7 @@ static int objects_remove_active_exec(bContext *C, wmOperator *op)
        if (!ok)
                BKE_report(op->reports, RPT_ERROR, "Active object contains no groups");
        
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
        
        return OPERATOR_FINISHED;
@@ -270,7 +271,7 @@ static int group_objects_remove_all_exec(bContext *C, wmOperator *UNUSED(op))
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
        
        return OPERATOR_FINISHED;
@@ -321,7 +322,7 @@ static int group_objects_remove_exec(bContext *C, wmOperator *op)
        if (!updated)
                return OPERATOR_CANCELLED;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
        return OPERATOR_FINISHED;
@@ -367,7 +368,7 @@ static int group_create_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
        
        return OPERATOR_FINISHED;
index abb0172d9cedeee897c38d440d892571ac57eb1b..fce55689e9a9046452167489b99a481796057604 100644 (file)
@@ -48,7 +48,6 @@
 
 #include "BKE_action.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_layer.h"
 #include "BKE_main.h"
 #include "BKE_modifier.h"
@@ -58,6 +57,9 @@
 #include "BKE_deform.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
@@ -319,7 +321,7 @@ static bool object_hook_index_array(Scene *scene, Object *obedit,
                        EDBM_mesh_load(obedit);
                        EDBM_mesh_make(scene->toolsettings, obedit, true);
 
-                       DAG_id_tag_update(obedit->data, 0);
+                       DEG_id_tag_update(obedit->data, 0);
 
                        em = me->edit_btmesh;
 
@@ -548,7 +550,7 @@ static int add_hook_object(Main *bmain, Scene *scene, SceneLayer *sl, Object *ob
        /* apparently this call goes from right to left... */
        mul_m4_series(hmd->parentinv, pose_mat, ob->imat, obedit->obmat);
        
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        return true;
 }
@@ -658,7 +660,7 @@ static int object_hook_remove_exec(bContext *C, wmOperator *op)
        BLI_remlink(&ob->modifiers, (ModifierData *)hmd);
        modifier_free((ModifierData *)hmd);
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -732,7 +734,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op)
 
        BKE_object_modifier_hook_reset(ob, hmd);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -782,7 +784,7 @@ static int object_hook_recenter_exec(bContext *C, wmOperator *op)
        sub_v3_v3v3(hmd->cent, scene->cursor, ob->obmat[3]);
        mul_m3_v3(imat, hmd->cent);
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -840,7 +842,7 @@ static int object_hook_assign_exec(bContext *C, wmOperator *op)
        hmd->indexar = indexar;
        hmd->totindex = tot;
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
index 73ce1fae605a01305acbb45f1f0d6ae511430f29..4eafe715a6f3c2df0844bd5ad1f4e424435544fd 100644 (file)
 #include "RNA_enum_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_key.h"
 #include "BKE_lattice.h"
 #include "BKE_deform.h"
 #include "BKE_report.h"
 #include "BKE_utildefines.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_lattice.h"
 #include "ED_object.h"
 #include "ED_screen.h"
@@ -591,7 +592,7 @@ static int make_regular_exec(bContext *C, wmOperator *UNUSED(op))
                BKE_lattice_resize(lt, lt->pntsu, lt->pntsv, lt->pntsw, NULL);
        }
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
        return OPERATOR_FINISHED;
@@ -811,7 +812,7 @@ static int lattice_flip_exec(bContext *C, wmOperator *op)
        }
        
        /* updates */
-       DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, obedit->data);
        
        return OPERATOR_FINISHED;
index d614be175f25ba6dfbb34ec9ab6b1cffd798ec68..85751fd64de36a7579865ece330656cf656c84af 100644 (file)
@@ -54,7 +54,6 @@
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_displist.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_effect.h"
@@ -75,6 +74,9 @@
 #include "BKE_softbody.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -171,8 +173,8 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-       DAG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
 
        return new_md;
 }
@@ -253,7 +255,7 @@ bool ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v)
        for (md = ob->modifiers.first; md; md = md->next) {
                if (md->type == eModifierType_Multires) {
                        multires_set_tot_level(ob, (MultiresModifierData *)md, totlevel);
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
        }
        return false;
@@ -320,7 +322,7 @@ static bool object_modifier_remove(Main *bmain, Object *ob, ModifierData *md,
                ob->mode &= ~OB_MODE_PARTICLE_EDIT;
        }
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        BLI_remlink(&ob->modifiers, md);
        modifier_free(md);
@@ -341,8 +343,8 @@ bool ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, Mod
                return 0;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-       DAG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
 
        return 1;
 }
@@ -365,8 +367,8 @@ void ED_object_modifier_clear(Main *bmain, Object *ob)
                md = next_md;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-       DAG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
 }
 
 int ED_object_modifier_move_up(ReportList *reports, Object *ob, ModifierData *md)
@@ -515,7 +517,7 @@ int ED_object_modifier_convert(ReportList *UNUSED(reports), Main *bmain, Scene *
                }
        }
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        return 1;
 }
@@ -643,7 +645,7 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
 
                MEM_freeN(vertexCos);
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
        else {
                BKE_report(reports, RPT_ERROR, "Cannot apply modifier for this object type");
@@ -924,7 +926,7 @@ static int modifier_move_up_exec(bContext *C, wmOperator *op)
        if (!md || !ED_object_modifier_move_up(op->reports, ob, md))
                return OPERATOR_CANCELLED;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -963,7 +965,7 @@ static int modifier_move_down_exec(bContext *C, wmOperator *op)
        if (!md || !ED_object_modifier_move_down(op->reports, ob, md))
                return OPERATOR_CANCELLED;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1005,7 +1007,7 @@ static int modifier_apply_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1055,7 +1057,7 @@ static int modifier_convert_exec(bContext *C, wmOperator *op)
        if (!md || !ED_object_modifier_convert(op->reports, bmain, scene, sl, ob, md))
                return OPERATOR_CANCELLED;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1094,7 +1096,7 @@ static int modifier_copy_exec(bContext *C, wmOperator *op)
        if (!md || !ED_object_modifier_copy(op->reports, ob, md))
                return OPERATOR_CANCELLED;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1188,7 +1190,7 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op)
                             ED_object_multires_update_totlevels_cb,
                             &mmd->totlvl);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
        if (ob->mode & OB_MODE_SCULPT) {
@@ -1257,7 +1259,7 @@ static int multires_reshape_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
        return OPERATOR_FINISHED;
@@ -1405,7 +1407,7 @@ static int multires_base_apply_exec(bContext *C, wmOperator *op)
        
        multiresModifier_base_apply(mmd, ob);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1511,7 +1513,7 @@ static int skin_root_mark_exec(bContext *C, wmOperator *UNUSED(op))
 
        BLI_gset_free(visited, NULL);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1566,7 +1568,7 @@ static int skin_loose_mark_clear_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1616,7 +1618,7 @@ static int skin_radii_equalize_exec(bContext *C, wmOperator *UNUSED(op))
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -1789,8 +1791,8 @@ static int skin_armature_create_exec(bContext *C, wmOperator *op)
 
                arm_md->object = arm_ob;
                arm_md->deformflag = ARM_DEF_VGROUP | ARM_DEF_QUATERNION;
-               DAG_relations_tag_update(bmain);
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_relations_tag_update(bmain);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
 
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
@@ -1857,7 +1859,7 @@ static int correctivesmooth_bind_exec(bContext *C, wmOperator *op)
                csmd->bind_coords_num = (unsigned int)-1;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
        return OPERATOR_FINISHED;
@@ -1926,7 +1928,7 @@ static int meshdeform_bind_exec(bContext *C, wmOperator *op)
                mmd->totcagevert = 0;
                mmd->totinfluence = 0;
                
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        }
        else {
@@ -2000,7 +2002,7 @@ static int explode_refresh_exec(bContext *C, wmOperator *op)
 
        emd->flag |= eExplodeFlag_CalcFaces;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        
        return OPERATOR_FINISHED;
@@ -2145,7 +2147,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op)
        
        if (free) {
                omd->refresh |= MOD_OCEAN_REFRESH_CLEAR_CACHE;
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
                return OPERATOR_FINISHED;
        }
@@ -2195,7 +2197,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op)
        
        scene->r.cfra = cfra;
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 #endif
        
@@ -2268,7 +2270,7 @@ static int laplaciandeform_bind_exec(bContext *C, wmOperator *op)
        else {
                lmd->flag |= MOD_LAPLACIANDEFORM_BIND;
        }
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
        return OPERATOR_FINISHED;
 }
@@ -2320,7 +2322,7 @@ static int surfacedeform_bind_exec(bContext *C, wmOperator *op)
                smd->flags |= MOD_SDEF_BIND;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);
 
        return OPERATOR_FINISHED;
index f19b5619066a4e09e708d7cefb638dd8bc1b7f11..ae3a3866c249072d8edc9a687741744ec5cce6f2 100644 (file)
@@ -67,7 +67,6 @@
 #include "BKE_context.h"
 #include "BKE_constraint.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_displist.h"
 #include "BKE_global.h"
@@ -94,6 +93,9 @@
 #include "BKE_texture.h"
 #include "BKE_editmesh.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -145,7 +147,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
                EDBM_mesh_load(obedit);
                EDBM_mesh_make(scene->toolsettings, obedit, true);
 
-               DAG_id_tag_update(obedit->data, 0);
+               DEG_id_tag_update(obedit->data, 0);
 
                em = me->edit_btmesh;
 
@@ -233,7 +235,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
        {
                if (ob != obedit) {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                        par = obedit->parent;
 
                        if (BKE_object_parent_loop_check(par, ob)) {
@@ -266,7 +268,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 
        WM_event_add_notifier(C, NC_OBJECT, NULL);
 
@@ -371,8 +373,8 @@ static int make_proxy_exec(bContext *C, wmOperator *op)
                BKE_object_make_proxy(newob, ob, gob);
 
                /* depsgraph flushes are needed for the new data */
-               DAG_relations_tag_update(bmain);
-               DAG_id_tag_update(&newob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+               DEG_relations_tag_update(bmain);
+               DEG_id_tag_update(&newob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, newob);
        }
        else {
@@ -527,7 +529,7 @@ void ED_object_parent_clear(Object *ob, const int type)
        /* Always clear parentinv matrix for sake of consistency, see T41950. */
        unit_m4(ob->parentinv);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 }
 
 /* note, poll should check for editable scene */
@@ -542,7 +544,7 @@ static int parent_clear_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
        WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
        return OPERATOR_FINISHED;
@@ -616,7 +618,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
        bPoseChannel *pchan = NULL;
        const bool pararm = ELEM(partype, PAR_ARMATURE, PAR_ARMATURE_NAME, PAR_ARMATURE_ENVELOPE, PAR_ARMATURE_AUTO);
 
-       DAG_id_tag_update(&par->id, OB_RECALC_OB);
+       DEG_id_tag_update(&par->id, OB_RECALC_OB);
 
        /* preconditions */
        if (partype == PAR_FOLLOW || partype == PAR_PATH_CONST) {
@@ -713,7 +715,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
                                                                        ((CurveModifierData *)md)->object = par;
                                                                }
                                                                if (par->curve_cache && par->curve_cache->path == NULL) {
-                                                                       DAG_id_tag_update(&par->id, OB_RECALC_DATA);
+                                                                       DEG_id_tag_update(&par->id, OB_RECALC_DATA);
                                                                }
                                                        }
                                                        break;
@@ -796,7 +798,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object
                                invert_m4_m4(ob->parentinv, workob.obmat);
                        }
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
                }
        }
 
@@ -882,7 +884,7 @@ static int parent_set_exec(bContext *C, wmOperator *op)
        if (!ok)
                return OPERATOR_CANCELLED;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
        WM_event_add_notifier(C, NC_OBJECT | ND_PARENT, NULL);
 
@@ -998,7 +1000,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
        Main *bmain = CTX_data_main(C);
        Object *par = ED_object_active_context(C);
 
-       DAG_id_tag_update(&par->id, OB_RECALC_OB);
+       DEG_id_tag_update(&par->id, OB_RECALC_OB);
 
        /* context iterator */
        CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects)
@@ -1013,7 +1015,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
                                memset(ob->loc, 0, 3 * sizeof(float));
 
                                /* set recalc flags */
-                               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
                                /* set parenting type for object - object only... */
                                ob->parent = par;
@@ -1023,7 +1025,7 @@ static int parent_noinv_set_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
        return OPERATOR_FINISHED;
@@ -1058,7 +1060,7 @@ static int object_slow_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))
                                ob->partype -= PARSLOW;
                                BKE_object_where_is_calc(scene, ob);
                                ob->partype |= PARSLOW;
-                               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
                        }
                }
        }
@@ -1096,7 +1098,7 @@ static int object_slow_parent_set_exec(bContext *C, wmOperator *UNUSED(op))
                if (ob->parent)
                        ob->partype |= PARSLOW;
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;
 
@@ -1150,7 +1152,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
 
                /* remove track-object for old track */
                ob->track = NULL;
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                /* also remove all tracking constraints */
                for (con = ob->constraints.last; con; con = pcon) {
@@ -1164,7 +1166,7 @@ static int object_track_clear_exec(bContext *C, wmOperator *op)
        }
        CTX_DATA_END;
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
        return OPERATOR_FINISHED;
@@ -1224,7 +1226,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
                                        data = con->data;
                                        data->tar = obact;
-                                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                                        /* Lamp, Camera and Speaker track differently by default */
                                        if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1247,7 +1249,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
                                        data = con->data;
                                        data->tar = obact;
-                                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                                        /* Lamp, Camera and Speaker track differently by default */
                                        if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1271,7 +1273,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
 
                                        data = con->data;
                                        data->tar = obact;
-                                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                                        /* Lamp, Camera and Speaker track differently by default */
                                        if (ELEM(ob->type, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
@@ -1285,7 +1287,7 @@ static int track_set_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
 
        return OPERATOR_FINISHED;
@@ -1447,7 +1449,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                /* if amount of material indices changed: */
                                                test_object_materials(ob_dst, ob_dst->data);
 
-                                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
                                                break;
                                        case MAKE_LINKS_MATERIALS:
                                                /* new approach, using functions from kernel */
@@ -1455,7 +1457,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                        Material *ma = give_current_material(ob_src, a + 1);
                                                        assign_material(ob_dst, ma, a + 1, BKE_MAT_ASSIGN_USERPREF); /* also works with ma==NULL */
                                                }
-                                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_DATA);
                                                break;
                                        case MAKE_LINKS_ANIMDATA:
                                                BKE_animdata_copy_id((ID *)ob_dst, (ID *)ob_src, false);
@@ -1466,7 +1468,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                        }
                                                        BKE_animdata_copy_id((ID *)ob_dst->data, (ID *)ob_src->data, false);
                                                }
-                                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                                break;
                                        case MAKE_LINKS_GROUP:
                                        {
@@ -1495,7 +1497,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                break;
                                        case MAKE_LINKS_MODIFIERS:
                                                BKE_object_link_modifiers(ob_dst, ob_src);
-                                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                                break;
                                        case MAKE_LINKS_FONTS:
                                        {
@@ -1524,7 +1526,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                                                cu_dst->vfontbi = cu_src->vfontbi;
                                                id_us_plus((ID *)cu_dst->vfontbi);
 
-                                               DAG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                                               DEG_id_tag_update(&ob_dst->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
                                                break;
                                        }
                                }
@@ -1547,7 +1549,7 @@ static int make_links_data_exec(bContext *C, wmOperator *op)
                BKE_report(op->reports, RPT_WARNING, "Skipped editing library object data");
        }
 
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
        WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
        WM_event_add_notifier(C, NC_ANIMATION | ND_NLA_ACTCHANGE, CTX_wm_view3d(C));
        WM_event_add_notifier(C, NC_OBJECT, NULL);
@@ -1781,7 +1783,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const
                        id = ob->data;
 
                        if (id && id->us > 1 && !ID_IS_LINKED_DATABLOCK(id)) {
-                               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
                                switch (ob->type) {
                                        case OB_LAMP:
@@ -1819,7 +1821,7 @@ static void single_obdata_users(Main *bmain, Scene *scene, SceneLayer *sl, const
                                                        BKE_animdata_copy_id_action((ID *)lat->key, false);
                                                break;
                                        case OB_ARMATURE:
-                                               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                                                ob->data = ID_NEW_SET(ob->data, BKE_armature_copy(bmain, ob->data));
                                                BKE_pose_rebuild(ob, ob->data);
                                                break;
@@ -1856,7 +1858,7 @@ static void single_object_action_users(Scene *scene, SceneLayer *sl, const int f
 {
        FOREACH_OBJECT_FLAG(scene, sl, flag, ob)
                if (!ID_IS_LINKED_DATABLOCK(ob)) {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        BKE_animdata_copy_id_action(&ob->id, false);
                }
        FOREACH_OBJECT_FLAG_END
@@ -2048,7 +2050,7 @@ void ED_object_single_users(Main *bmain, Scene *scene, const bool full, const bo
                }
        }
        BKE_main_id_clear_newpoins(bmain);
-       DAG_relations_tag_update(bmain);
+       DEG_relations_tag_update(bmain);
 }
 
 /******************************* Make Local ***********************************/
@@ -2148,7 +2150,7 @@ static bool make_local_all__instance_indirect_unused(Main *bmain, Scene *scene,
                        base = BKE_scene_layer_base_find(sl, ob);
                        base->flag |= BASE_SELECTED;
                        BKE_scene_object_base_flag_sync_from_base(base);
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME);
 
                        changed = true;
                }
@@ -2355,7 +2357,7 @@ static int make_single_user_exec(bContext *C, wmOperator *op)
        WM_event_add_notifier(C, NC_WINDOW, NULL);
 
        if (update_deps) {
-               DAG_relations_tag_update(bmain);
+               DEG_relations_tag_update(bmain);
        }
 
        return OPERATOR_FINISHED;
@@ -2405,7 +2407,7 @@ static int drop_named_material_invoke(bContext *C, wmOperator *op, const wmEvent
 
        assign_material(base->object, ma, 1, BKE_MAT_ASSIGN_USERPREF);
 
-       DAG_id_tag_update(&base->object->id, OB_RECALC_OB);
+       DEG_id_tag_update(&base->object->id, OB_RECALC_OB);
 
        WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, base->object);
        WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));
index e04114761e4971aefc81967df429dbabd26df21d..b7c0a2679bc0c31550480cff83bb304df460d9de 100644 (file)
@@ -51,7 +51,6 @@
 #include "DNA_object_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_key.h"
 #include "BKE_library.h"
 #include "BKE_main.h"
@@ -59,6 +58,9 @@
 #include "BKE_lattice.h"
 #include "BKE_curve.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "BLI_sys_types.h" // for intptr_t support
 
 #include "ED_object.h"
@@ -213,7 +215,7 @@ static bool object_shape_key_mirror(bContext *C, Object *ob,
        *r_totmirr = totmirr;
        *r_totfail = totfail;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return 1;
@@ -264,8 +266,8 @@ static int shape_key_add_exec(bContext *C, wmOperator *op)
 
        ED_object_shape_key_add(C, ob, from_mix);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(CTX_data_main(C));
 
        return OPERATOR_FINISHED;
 }
@@ -302,8 +304,8 @@ static int shape_key_remove_exec(bContext *C, wmOperator *op)
        }
 
        if (changed) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
-               DAG_relations_tag_update(CTX_data_main(C));
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_relations_tag_update(CTX_data_main(C));
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
                return OPERATOR_FINISHED;
@@ -343,7 +345,7 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
        for (kb = key->block.first; kb; kb = kb->next)
                kb->curval = 0.0f;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        
        return OPERATOR_FINISHED;
@@ -378,7 +380,7 @@ static int shape_key_retime_exec(bContext *C, wmOperator *UNUSED(op))
        for (kb = key->block.first; kb; kb = kb->next)
                kb->pos = (cfra += 0.1f);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return OPERATOR_FINISHED;
@@ -469,7 +471,7 @@ static int shape_key_move_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return OPERATOR_FINISHED;
index 4d7d7df0d2fa8828daa780a295e57c0b8063dcdf..8733b3c1b06e132710f6ce0d21303065e7653484 100644 (file)
@@ -46,7 +46,6 @@
 
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_idcode.h"
 #include "BKE_mball.h"
@@ -59,6 +58,8 @@
 #include "BKE_lattice.h"
 #include "BKE_tracking.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_define.h"
 #include "RNA_access.h"
 
@@ -265,7 +266,7 @@ static int object_clear_transform_generic_exec(bContext *C, wmOperator *op,
                        ED_autokeyframe_object(C, scene, ob, ks);
                        
                        /* tag for updates */
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
                }
        }
        CTX_DATA_END;
@@ -371,7 +372,7 @@ static int object_origin_clear_exec(bContext *C, wmOperator *UNUSED(op))
                        mul_m3_v3(mat, v3);
                }
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        }
        CTX_DATA_END;
 
@@ -617,7 +618,7 @@ static int apply_objects_internal(bContext *C, ReportList *reports, bool apply_l
 
                ignore_parent_tx(bmain, scene, ob);
 
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
                changed = true;
        }
@@ -644,7 +645,7 @@ static int visual_transform_apply_exec(bContext *C, wmOperator *UNUSED(op))
                BKE_object_where_is_calc(scene, ob);
 
                /* update for any children that may get moved */
-               DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+               DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        
                changed = true;
        }
@@ -784,7 +785,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
                        EDBM_mesh_normals_update(em);
                        tot_change++;
-                       DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
                }
        }
 
@@ -898,7 +899,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
                                if (obedit) {
                                        if (centermode == GEOMETRY_TO_ORIGIN) {
-                                               DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
                                        }
                                        break;
                                }
@@ -976,7 +977,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
                                if (obedit) {
                                        if (centermode == GEOMETRY_TO_ORIGIN) {
-                                               DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
+                                               DEG_id_tag_update(&obedit->id, OB_RECALC_DATA);
                                        }
                                        break;
                                }
@@ -1034,7 +1035,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
                                              (ob->transflag | ob_other->transflag) & OB_DUPLIGROUP)))
                                        {
                                                ob_other->flag |= OB_DONE;
-                                               DAG_id_tag_update(&ob_other->id, OB_RECALC_OB | OB_RECALC_DATA);
+                                               DEG_id_tag_update(&ob_other->id, OB_RECALC_OB | OB_RECALC_DATA);
 
                                                mul_v3_mat3_m4v3(centn, ob_other->obmat, cent); /* omit translation part */
                                                add_v3_v3(ob_other->loc, centn);
@@ -1054,7 +1055,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op)
 
        for (tob = bmain->object.first; tob; tob = tob->id.next)
                if (tob->data && (((ID *)tob->data)->tag & LIB_TAG_DOIT))
-                       DAG_id_tag_update(&tob->id, OB_RECALC_OB | OB_RECALC_DATA);
+                       DEG_id_tag_update(&tob->id, OB_RECALC_OB | OB_RECALC_DATA);
 
        if (tot_change) {
                WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
index d93275a353e527ef38b1adb9a08b40ed3048b79a..51723ac14d32e032856dd2aa46349e1cac585425 100644 (file)
@@ -56,7 +56,6 @@
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_editmesh.h"
 #include "BKE_layer.h"
@@ -67,6 +66,8 @@
 #include "BKE_object.h"
 #include "BKE_lattice.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_armature_types.h"
 #include "RNA_access.h"
 #include "RNA_define.h"
@@ -2582,7 +2583,7 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op))
        Object *ob = ED_object_context(C);
 
        BKE_object_defgroup_add(ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        
@@ -2615,7 +2616,7 @@ static int vertex_group_remove_exec(bContext *C, wmOperator *op)
        else
                vgroup_delete_active(ob);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        
@@ -2650,7 +2651,7 @@ static int vertex_group_assign_exec(bContext *C, wmOperator *UNUSED(op))
        Object *ob = ED_object_context(C);
        
        vgroup_assign_verts(ob, ts->vgroup_weight);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        
        return OPERATOR_FINISHED;
@@ -2723,7 +2724,7 @@ static int vertex_group_remove_from_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
        return OPERATOR_FINISHED;
@@ -2812,7 +2813,7 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op))
        Object *ob = ED_object_context(C);
 
        vgroup_duplicate(ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob->data);
 
@@ -2848,7 +2849,7 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op)
        vgroup_levels_subset(ob, vgroup_validmap, vgroup_tot, subset_count, offset, gain);
        MEM_freeN((void *)vgroup_validmap);
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        
@@ -2882,7 +2883,7 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op))
        changed = vgroup_normalize(ob);
 
        if (changed) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -2921,7 +2922,7 @@ static int vertex_group_normalize_all_exec(bContext *C, wmOperator *op)
        MEM_freeN((void *)vgroup_validmap);
 
        if (changed) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -2976,7 +2977,7 @@ static int vertex_group_fix_exec(bContext *C, wmOperator *op)
        }
        vgroup_fix(scene, ob, distToBe, strength, cp);
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        
@@ -3048,7 +3049,7 @@ static int vertex_group_invert_exec(bContext *C, wmOperator *op)
        vgroup_invert_subset(ob, vgroup_validmap, vgroup_tot, subset_count, auto_assign, auto_remove);
        MEM_freeN((void *)vgroup_validmap);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3091,7 +3092,7 @@ static int vertex_group_smooth_exec(bContext *C, wmOperator *op)
        vgroup_smooth_subset(ob, vgroup_validmap, vgroup_tot, subset_count, fac, repeat, fac_expand, source);
        MEM_freeN((void *)vgroup_validmap);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3141,7 +3142,7 @@ static int vertex_group_clean_exec(bContext *C, wmOperator *op)
        vgroup_clean_subset(ob, vgroup_validmap, vgroup_tot, subset_count, limit, keep_single);
        MEM_freeN((void *)vgroup_validmap);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3182,7 +3183,7 @@ static int vertex_group_quantize_exec(bContext *C, wmOperator *op)
        vgroup_quantize_subset(ob, vgroup_validmap, vgroup_tot, subset_count, steps);
        MEM_freeN((void *)vgroup_validmap);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3223,7 +3224,7 @@ static int vertex_group_limit_total_exec(bContext *C, wmOperator *op)
        BKE_reportf(op->reports, remove_tot ? RPT_INFO : RPT_WARNING, "%d vertex weights limited", remove_tot);
 
        if (remove_tot) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
                WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3268,7 +3269,7 @@ static int vertex_group_mirror_exec(bContext *C, wmOperator *op)
 
        ED_mesh_report_mirror(op, totmirr, totfail);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
 
@@ -3312,7 +3313,7 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op))
                                BLI_duplicatelist(&ob_iter->defbase, &ob_active->defbase);
                                ob_iter->actdef = ob_active->actdef;
 
-                               DAG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
                                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter);
                                WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob_iter->data);
 
@@ -3350,7 +3351,7 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op)
        {
                if (obact != ob) {
                        if (ED_vgroup_array_copy(ob, obact)) {
-                               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                                WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
                                changed_tot++;
                        }
@@ -3393,7 +3394,7 @@ static int set_active_group_exec(bContext *C, wmOperator *op)
        BLI_assert(nr + 1 >= 0);
        ob->actdef = nr + 1;
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
 
        return OPERATOR_FINISHED;
@@ -3607,7 +3608,7 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op)
        ret = vgroup_do_remap(ob, name_array, op);
 
        if (ret != OPERATOR_CANCELLED) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
        }
 
@@ -3657,7 +3658,7 @@ static int vgroup_move_exec(bContext *C, wmOperator *op)
                ret = vgroup_do_remap(ob, name_array, op);
 
                if (ret != OPERATOR_CANCELLED) {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_GEOM | ND_VERTEX_GROUP, ob);
                }
        }
@@ -3786,7 +3787,7 @@ static int vertex_weight_paste_exec(bContext *C, wmOperator *op)
 
        vgroup_copy_active_to_sel_single(ob, def_nr);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return OPERATOR_FINISHED;
@@ -3823,7 +3824,7 @@ static int vertex_weight_delete_exec(bContext *C, wmOperator *op)
 
        vgroup_remove_weight(ob, def_nr);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return OPERATOR_FINISHED;
@@ -3856,7 +3857,7 @@ static int vertex_weight_set_active_exec(bContext *C, wmOperator *op)
 
        if (wg_index != -1) {
                ob->actdef = wg_index + 1;
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        }
 
@@ -3893,7 +3894,7 @@ static int vertex_weight_normalize_active_vertex_exec(bContext *C, wmOperator *U
        changed = vgroup_normalize_active_vertex(ob, subset_type);
 
        if (changed) {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
                return OPERATOR_FINISHED;
@@ -3926,7 +3927,7 @@ static int vertex_weight_copy_exec(bContext *C, wmOperator *UNUSED(op))
 
        vgroup_copy_active_to_sel(ob, subset_type);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
 
        return OPERATOR_FINISHED;
index 898422dac5181c5ec3b5efe81ce94399b653a4c1..3cecdccd758480bb71f4d2ba3ba5a49da6275cbf 100644 (file)
@@ -23,6 +23,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../gpu
        ../../makesdna
        ../../makesrna
index af2dc31e34f5edcf5e0e1fe77bac03fd7275e6b5..a5e78e116c68c011d4d5b02e52a8a6179f596612 100644 (file)
@@ -42,7 +42,6 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_object_deform.h"
-#include "BKE_depsgraph.h"
 #include "BKE_dynamicpaint.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
@@ -50,6 +49,9 @@
 #include "BKE_report.h"
 #include "BKE_screen.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "ED_mesh.h"
 #include "ED_screen.h"
 #include "ED_object.h"
@@ -135,7 +137,7 @@ static int surface_slot_remove_exec(bContext *C, wmOperator *UNUSED(op))
        }
 
        dynamicPaint_resetPreview(canvas);
-       DAG_id_tag_update(&obj_ctx->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&obj_ctx->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, obj_ctx);
 
        return OPERATOR_FINISHED;
@@ -181,8 +183,8 @@ static int type_toggle_exec(bContext *C, wmOperator *op)
        }
        
        /* update dependency */
-       DAG_id_tag_update(&cObject->id, OB_RECALC_DATA);
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_id_tag_update(&cObject->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(CTX_data_main(C));
        WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, cObject);
 
        return OPERATOR_FINISHED;
index 14b12497c4ac5c6dbc5255e048ae6712e02f5d99..681ac75e847d131d7701309f1baccee15e3a0060 100644 (file)
 
 #include "BKE_boids.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_main.h"
 #include "BKE_particle.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_enum_types.h"
 #include "RNA_define.h"
@@ -75,7 +77,7 @@ static int rule_add_exec(bContext *C, wmOperator *op)
 
        BLI_addtail(&state->rules, rule);
 
-       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
        
        return OPERATOR_FINISHED;
 }
@@ -121,8 +123,8 @@ static int rule_del_exec(bContext *C, wmOperator *UNUSED(op))
        if (rule)
                rule->flag |= BOIDRULE_CURRENT;
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
 
        return OPERATOR_FINISHED;
 }
@@ -158,7 +160,7 @@ static int rule_move_up_exec(bContext *C, wmOperator *UNUSED(op))
                        BLI_remlink(&state->rules, rule);
                        BLI_insertlinkbefore(&state->rules, rule->prev, rule);
 
-                       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+                       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
                        break;
                }
        }
@@ -194,7 +196,7 @@ static int rule_move_down_exec(bContext *C, wmOperator *UNUSED(op))
                        BLI_remlink(&state->rules, rule);
                        BLI_insertlinkafter(&state->rules, rule->next, rule);
 
-                       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+                       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
                        break;
                }
        }
@@ -277,8 +279,8 @@ static int state_del_exec(bContext *C, wmOperator *UNUSED(op))
 
        state->flag |= BOIDSTATE_CURRENT;
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
        
        return OPERATOR_FINISHED;
 }
@@ -349,7 +351,7 @@ static int state_move_down_exec(bContext *C, wmOperator *UNUSED(op))
                if (state->flag & BOIDSTATE_CURRENT && state->next) {
                        BLI_remlink(&boids->states, state);
                        BLI_insertlinkafter(&boids->states, state->next, state);
-                       DAG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
+                       DEG_id_tag_update(&part->id, OB_RECALC_DATA|PSYS_RECALC_RESET);
                        break;
                }
        }
index a77a7d271d9b3b5419a98f945ef994b7c3744b9f..27ea7e09fd60b3171c2c9dcc66e7d5919c4929c5 100644 (file)
@@ -53,7 +53,6 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
@@ -64,6 +63,8 @@
 #include "BKE_bvhutils.h"
 #include "BKE_pointcache.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BIF_gl.h"
 
 #include "ED_object.h"
@@ -2619,7 +2620,7 @@ static int remove_doubles_exec(bContext *C, wmOperator *op)
 
        BKE_reportf(op->reports, RPT_INFO, "Removed %d double particles", totremoved);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
        return OPERATOR_FINISHED;
@@ -2672,7 +2673,7 @@ static int weight_set_exec(bContext *C, wmOperator *op)
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
 
        return OPERATOR_FINISHED;
@@ -2781,7 +2782,7 @@ static int delete_exec(bContext *C, wmOperator *op)
                recalc_lengths(data.edit);
        }
 
-       DAG_id_tag_update(&data.ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&data.ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, data.ob);
 
        return OPERATOR_FINISHED;
@@ -2967,7 +2968,7 @@ static int mirror_exec(bContext *C, wmOperator *UNUSED(op))
 
        update_world_cos(ob, edit);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        return OPERATOR_FINISHED;
 }
@@ -3976,7 +3977,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
 
                                update_world_cos(ob, edit);
                                psys_free_path_cache(NULL, edit);
-                               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        }
                        else
                                PE_update_object(scene, sl, ob, 1);
@@ -3986,7 +3987,7 @@ static void brush_edit_apply(bContext *C, wmOperator *op, PointerRNA *itemptr)
                        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
                }
                else {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
                }
 
@@ -4237,7 +4238,7 @@ static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
                if (removed) {
                        update_world_cos(ob, edit);
                        psys_free_path_cache(NULL, edit);
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
                else
                        PE_update_object(scene, sl, ob, 1);
@@ -4246,7 +4247,7 @@ static int shape_cut_exec(bContext *C, wmOperator *UNUSED(op))
                        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
                }
                else {
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
                }
                
@@ -4487,7 +4488,7 @@ void PE_undo_step(Scene *scene, SceneLayer *sl, int step)
                }
        }
 
-       DAG_id_tag_update(&OBACT_NEW->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&OBACT_NEW->id, OB_RECALC_DATA);
 }
 
 bool PE_undo_is_valid(Scene *scene, SceneLayer *sl)
@@ -4761,7 +4762,7 @@ static int particle_edit_toggle_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_OBJECT, NULL);
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        return OPERATOR_FINISHED;
 }
@@ -4802,7 +4803,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op))
 
                        psys_reset(psys, PSYS_RESET_DEPSGRAPH);
                        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                }
        }
        else { /* some operation might have protected hair from editing so let's clear the flag */
@@ -4810,7 +4811,7 @@ static int clear_edited_exec(bContext *C, wmOperator *UNUSED(op))
                psys->flag &= ~PSYS_GLOBAL_HAIR;
                psys->flag &= ~PSYS_EDITED;
                WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        }
 
        return OPERATOR_FINISHED;
@@ -4926,7 +4927,7 @@ static int unify_length_exec(bContext *C, wmOperator *UNUSED(op))
                WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE|NA_EDITED, ob);
        }
        else {
-               DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+               DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                WM_event_add_notifier(C, NC_OBJECT|ND_MODIFIER, ob);
        }
 
index 782e0253267e81359537111b5eec6ef6c0fbbbf3..cd7bb8640b5b5d19eb74974d7808816f52ec0a10 100644 (file)
@@ -43,7 +43,6 @@
 #include "BLI_string.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_global.h"
@@ -55,6 +54,9 @@
 #include "BKE_pointcache.h"
 #include "BKE_report.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 
@@ -209,8 +211,8 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op))
 
        psys_check_boid_data(psys);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
        
@@ -257,8 +259,8 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
 
        BLI_addtail(&psys->targets, pt);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
        
@@ -305,8 +307,8 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op))
        if (pt)
                pt->flag |= PTARGET_CURRENT;
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
 
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
        
@@ -345,7 +347,7 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op))
                        BLI_remlink(&psys->targets, pt);
                        BLI_insertlinkbefore(&psys->targets, pt->prev, pt);
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
                        break;
                }
@@ -383,7 +385,7 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op))
                        BLI_remlink(&psys->targets, pt);
                        BLI_insertlinkafter(&psys->targets, pt->next, pt);
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
                        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
                        break;
                }
@@ -636,7 +638,7 @@ static int disconnect_hair_exec(bContext *C, wmOperator *op)
                disconnect_hair(scene, sl, ob, psys);
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
        return OPERATOR_FINISHED;
@@ -891,7 +893,7 @@ static int connect_hair_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE, ob);
 
        return OPERATOR_FINISHED;
@@ -1126,7 +1128,7 @@ static bool copy_particle_systems_to_object(Main *bmain,
        #undef PSYS_FROM_FIRST
        #undef PSYS_FROM_NEXT
        
-       DAG_id_tag_update(&ob_to->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob_to->id, OB_RECALC_DATA);
        WM_main_add_notifier(NC_OBJECT | ND_PARTICLE | NA_EDITED, ob_to);
        return true;
 }
index fb75e27131b0b1f474359f44cd04b177777dd82f..d93eb95243e484180ef0ec6ff68a1872c14992e9 100644 (file)
 #include "DNA_scene_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_group.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -91,8 +93,8 @@ bool ED_rigidbody_constraint_add(Main *bmain, Scene *scene, Object *ob, int type
        /* add constraint to rigid body constraint group */
        BKE_group_object_add(rbw->constraints, ob);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
        return true;
 }
 
@@ -104,8 +106,8 @@ void ED_rigidbody_constraint_remove(Main *bmain, Scene *scene, Object *ob)
        if (rbw)
                BKE_group_object_unlink(rbw->constraints, ob);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 /* ********************************************** */
index c9e32fa51940192d01278c3bda7231e82c1392b1..cf9dc8ff2a3491973d3a93a2d797d086ba02885f 100644 (file)
 #include "BLT_translation.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_group.h"
 #include "BKE_main.h"
 #include "BKE_report.h"
 #include "BKE_rigidbody.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
+
 #include "RNA_access.h"
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
@@ -121,8 +123,8 @@ bool ED_rigidbody_object_add(Main *bmain, Scene *scene, Object *ob, int type, Re
        /* add object to rigid body group */
        BKE_group_object_add(rbw->group, ob);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
        return true;
 }
@@ -135,8 +137,8 @@ void ED_rigidbody_object_remove(Main *bmain, Scene *scene, Object *ob)
        if (rbw)
                BKE_group_object_unlink(rbw->group, ob);
 
-       DAG_relations_tag_update(bmain);
-       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+       DEG_relations_tag_update(bmain);
+       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 }
 
 /* ********************************************** */
@@ -345,7 +347,7 @@ static int rigidbody_objects_shape_change_exec(bContext *C, wmOperator *op)
                        RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
                        RNA_enum_set(&ptr, "collision_shape", shape);
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
                        changed = true;
                }
@@ -527,7 +529,7 @@ static int rigidbody_objects_calc_mass_exec(bContext *C, wmOperator *op)
                        RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
                        RNA_float_set(&ptr, "mass", mass);
 
-                       DAG_id_tag_update(&ob->id, OB_RECALC_OB);
+                       DEG_id_tag_update(&ob->id, OB_RECALC_OB);
 
                        changed = true;
                }
index bdfbac3dba7b480216c5d199b8159e623c376a99..193fac6305093c1678e09887898765716814194c 100644 (file)
@@ -54,7 +54,6 @@
 #include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_colortools.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_library.h"
@@ -66,6 +65,8 @@
 #include "BKE_screen.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -722,7 +723,7 @@ static void render_endjob(void *rjv)
                        scene->lay_updated = 0;
                }
 
-               DAG_on_visible_update(G.main, false);
+               DEG_on_visible_update(G.main, false);
        }
 }
 
index 1caec1cca2c38ce4f1fdb7409564647b6add4580..ae938c3fa3040f41615cd9be05a95b67f0062439 100644 (file)
@@ -64,7 +64,6 @@
 #include "BKE_brush.h"
 #include "BKE_context.h"
 #include "BKE_colortools.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_idprop.h"
 #include "BKE_image.h"
@@ -80,6 +79,7 @@
 #include "BKE_texture.h"
 #include "BKE_world.h"
 
+#include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
 
 #include "IMB_imbuf.h"
@@ -587,7 +587,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty
                }
 
                /* TODO(sergey): Use proper flag for tagging here. */
-               DAG_id_tag_update(&sce->id, 0);
+               DEG_id_tag_update(&sce->id, 0);
                DEG_relations_tag_update(pr_main);
                BKE_scene_update_tagged(pr_main->eval_ctx, pr_main, sce);
 
index e031e9a641c201e7b69b5b7491fd84bf29b67ade..5da3da98e6d1e0d61f58ae2904405dd5c2ee7c4c 100644 (file)
@@ -50,7 +50,6 @@
 #include "BKE_animsys.h"
 #include "BKE_context.h"
 #include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -66,7 +65,8 @@
 #include "BKE_world.h"
 #include "BKE_editmesh.h"
 
-
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 
 #ifdef WITH_FREESTYLE
 #  include "BKE_freestyle.h"
@@ -154,7 +154,7 @@ static int material_slot_remove_exec(bContext *C, wmOperator *op)
                WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, NULL);
        }
        
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
        WM_event_add_notifier(C, NC_OBJECT | ND_OB_SHADING, ob);
        WM_event_add_notifier(C, NC_MATERIAL | ND_SHADING_PREVIEW, ob);
@@ -220,7 +220,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
                }
        }
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        
        return OPERATOR_FINISHED;
@@ -360,7 +360,7 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op))
                        
                        if (ob_iter->totcol == ob->totcol) {
                                ob_iter->actcol = ob->actcol;
-                               DAG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
+                               DEG_id_tag_update(&ob_iter->id, OB_RECALC_DATA);
                                WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob_iter);
                        }
                }
@@ -425,7 +425,7 @@ static int material_slot_move_exec(bContext *C, wmOperator *op)
 
        MEM_freeN(slot_remap);
 
-       DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+       DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
        WM_event_add_notifier(C, NC_OBJECT | ND_DRAW | ND_DATA, ob);
 
        return OPERATOR_FINISHED;
@@ -630,8 +630,8 @@ static int render_layer_add_exec(bContext *C, wmOperator *UNUSED(op))
        BKE_scene_layer_add(scene, NULL);
        scene->active_layer = BLI_listbase_count(&scene->render_layers) - 1;
 
-       DAG_id_tag_update(&scene->id, 0);
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_id_tag_update(&scene->id, 0);
+       DEG_relations_tag_update(CTX_data_main(C));
        WM_event_add_notifier(C, NC_SCENE | ND_LAYER, scene);
        
        return OPERATOR_FINISHED;
@@ -660,8 +660,8 @@ static int render_layer_remove_exec(bContext *C, wmOperator *UNUSED(op))
                return OPERATOR_CANCELLED;
        }
 
-       DAG_id_tag_update(&scene->id, 0);
-       DAG_relations_tag_update(CTX_data_main(C));
+       DEG_id_tag_update(&scene->id, 0);
+       DEG_relations_tag_update(CTX_data_main(C));
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
        
        return OPERATOR_FINISHED;
@@ -804,7 +804,7 @@ static int freestyle_module_remove_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_freestyle_module_delete(&srl->freestyleConfig, module);
 
-       DAG_id_tag_update(&scene->id, 0);
+       DEG_id_tag_update(&scene->id, 0);
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
        return OPERATOR_FINISHED;
@@ -834,7 +834,7 @@ static int freestyle_module_move_exec(bContext *C, wmOperator *op)
        int dir = RNA_enum_get(op->ptr, "direction");
 
        if (BKE_freestyle_module_move(&srl->freestyleConfig, module, dir)) {
-               DAG_id_tag_update(&scene->id, 0);
+               DEG_id_tag_update(&scene->id, 0);
                WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
        }
 
@@ -874,7 +874,7 @@ static int freestyle_lineset_add_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_freestyle_lineset_add(bmain, &srl->freestyleConfig, NULL);
 
-       DAG_id_tag_update(&scene->id, 0);
+       DEG_id_tag_update(&scene->id, 0);
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
        return OPERATOR_FINISHED;
@@ -938,7 +938,7 @@ static int freestyle_lineset_paste_exec(bContext *C, wmOperator *UNUSED(op))
 
        FRS_paste_active_lineset(&srl->freestyleConfig);
 
-       DAG_id_tag_update(&scene->id, 0);
+       DEG_id_tag_update(&scene->id, 0);
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
        return OPERATOR_FINISHED;
@@ -966,7 +966,7 @@ static int freestyle_lineset_remove_exec(bContext *C, wmOperator *UNUSED(op))
 
        FRS_delete_active_lineset(&srl->freestyleConfig);
 
-       DAG_id_tag_update(&scene->id, 0);
+       DEG_id_tag_update(&scene->id, 0);
        WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
 
        return OPERATOR_FINISHED;
@@ -994,7 +994,7 @@ static int freestyle_lineset_move_exec(bContext *C, wmOperator *op)
        int dir = RNA_enum_get(op->ptr, "direction");
 
        if (FRS_move_active_lineset(&srl->freestyleConfig, dir)) {
-               DAG_id_tag_update(&scene->id, 0);
+               DEG_id_tag_update(&scene->id, 0);
                WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, scene);
        }
 
@@ -1044,7 +1044,7 @@ static int freestyle_linestyle_new_exec(bContext *C, wmOperator *op)
        else {
                lineset->linestyle = BKE_linestyle_new(bmain, "LineStyle");
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1080,7 +1080,7 @@ static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op)
                BKE_report(op->reports, RPT_ERROR, "Unknown line color modifier type");
                return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1120,7 +1120,7 @@ static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op)
                BKE_report(op->reports, RPT_ERROR, "Unknown alpha transparency modifier type");
                return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1160,7 +1160,7 @@ static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op)
                BKE_report(op->reports, RPT_ERROR, "Unknown line thickness modifier type");
                return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1200,7 +1200,7 @@ static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op)
                BKE_report(op->reports, RPT_ERROR, "Unknown stroke geometry modifier type");
                return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1267,7 +1267,7 @@ static int freestyle_modifier_remove_exec(bContext *C, wmOperator *op)
                        BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
                        return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1317,7 +1317,7 @@ static int freestyle_modifier_copy_exec(bContext *C, wmOperator *op)
                        BKE_report(op->reports, RPT_ERROR, "The object the data pointer refers to is not a valid modifier");
                        return OPERATOR_CANCELLED;
        }
-       DAG_id_tag_update(&lineset->linestyle->id, 0);
+       DEG_id_tag_update(&lineset->linestyle->id, 0);
        WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
 
        return OPERATOR_FINISHED;
@@ -1371,7 +1371,7 @@ static int freestyle_modifier_move_exec(bContext *C, wmOperator *op)
        }
 
        if (changed) {
-               DAG_id_tag_update(&lineset->linestyle->id, 0);
+               DEG_id_tag_update(&lineset->linestyle->id, 0);
                WM_event_add_notifier(C, NC_LINESTYLE, lineset->linestyle);
        }
 
@@ -1492,7 +1492,7 @@ static int texture_slot_move_exec(bContext *C, wmOperator *op)
                        }
                }
 
-               DAG_id_tag_update(id, 0);
+               DEG_id_tag_update(id, 0);
                WM_event_add_notifier(C, NC_TEXTURE, CTX_data_scene(C));
        }
 
index 72199ca5c1f3772c4104f4959afa782fa485a58c..9fbebbc58cc9c988e71893e26cc920ebdce85c82 100644 (file)
@@ -23,6 +23,7 @@ set(INC
        ../../blenkernel
        ../../blenlib
        ../../blentranslation
+       ../../depsgraph
        ../../makesdna
        ../../makesrna
        ../../windowmanager
index 6956793435cf523ae9a4d07d1638ab3e6a9964dd..776e96bac2c866741b67feb088831add82d2362b 100644 (file)
 #include <stdio.h>
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_global.h"
 #include "BKE_library_remap.h"
 #include "BKE_main.h"
 #include "BKE_scene.h"
 #include "BKE_workspace.h"
 
+#include "DEG_depsgraph.h"
+
 #include "BLI_compiler_attrs.h"
 #include "BLI_listbase.h"
 
@@ -117,7 +118,7 @@ void ED_scene_changed_update(Main *bmain, bContext *C, Scene *scene_new, const b
        CTX_data_scene_set(C, scene_new);
        BKE_workspace_render_layer_set(CTX_wm_workspace(C), layer_new);
        BKE_scene_set_background(bmain, scene_new);
-       DAG_on_visible_update(bmain, false);
+       DEG_on_visible_update(bmain, false);
 
        ED_screen_update_after_scene_change(active_screen, scene_new);
        ED_render_engine_changed(bmain);
index 65b783463a95fde72d1aead744dc3422b9cf66af..a33019ce6215485bdb737990333dc9db25edfe8a 100644 (file)
@@ -41,7 +41,6 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
 #include "BKE_global.h"
index 46753df4e13aaef08c971c6db718ae6467c96410..ead420b1faac9f3e0056f0b7911eac56f728c218 100644 (file)
@@ -25,6 +25,7 @@ set(INC
        ../../blenlib
        ../../blentranslation
        ../../bmesh
+       ../../depsgraph
        ../../gpu
        ../../imbuf
        ../../makesdna
index 64bd866c0db4b69a72e93354a0daaff6e5567753..f31b5984c615d0f7af953b16eeaebfaa1d802fd1 100644 (file)
@@ -51,7 +51,6 @@
 #include "DNA_object_types.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_brush.h"
 #include "BKE_image.h"
@@ -61,6 +60,8 @@
 #include "BKE_paint.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 #include "UI_view2d.h"
 
@@ -372,7 +373,7 @@ void ED_image_undo_restore(bContext *C, ListBase *lb)
                        ibuf->userflags |= IB_MIPMAP_INVALID;  /* force mipmap recreatiom */
                ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
 
-               DAG_id_tag_update(&ima->id, 0);
+               DEG_id_tag_update(&ima->id, 0);
 
                BKE_image_release_ibuf(ima, ibuf, NULL);
        }
@@ -1520,7 +1521,7 @@ void ED_imapaint_bucket_fill(struct bContext *C, float color[3], wmOperator *op)
 
        ED_undo_paint_push_end(UNDO_PAINT_IMAGE);
 
-       DAG_id_tag_update(&ima->id, 0);
+       DEG_id_tag_update(&ima->id, 0);
 }
 
 
index 4f93c12385d97cb74b4b1beaa538c5e22c9f556e..eb6eebf3c548a8949508df77c06d6c36ffb8d83e 100644 (file)
 #include "BLI_task.h"
 
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_brush.h"
 #include "BKE_image.h"
 #include "BKE_paint.h"
 #include "BKE_report.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+
 #include "ED_paint.h"
 #include "ED_screen.h"
 
@@ -1355,7 +1356,7 @@ void paint_2d_redraw(const bContext *C, void *ps, bool final)
 
                /* compositor listener deals with updating */
                WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, s->image);
-               DAG_id_tag_update(&s->image->id, 0);
+               DEG_id_tag_update(&s->image->id, 0);
        }
        else {
                if (!s->sima || !s->sima->lock)
index e743607b75b390561c175ef4f135433936ea6232..d47c96bf22cb303a3bdefb7ddd82114a82878bff 100644 (file)
@@ -64,7 +64,6 @@
 #include "BKE_camera.h"
 #include "BKE_context.h"
 #include "BKE_colortools.h"
-#include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_idprop.h"
 #include "BKE_brush.h"
@@ -80,6 +79,8 @@
 #include "BKE_scene.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+
 #include "UI_interface.h"
 
 #include "ED_mesh.h"
@@ -3934,7 +3935,7 @@ static void project_paint_end(ProjPaintState *ps)
                ProjPaintImage *projIma;
                for (a = 0, projIma = ps->projImages; a < ps->image_tot; a++, projIma++) {
                        BKE_image_release_ibuf(projIma->ima, projIma->ibuf, NULL);
-                       DAG_id_tag_update(&projIma->ima->id, 0);
+                       DEG_id_tag_update(&projIma->ima->id, 0);
                }
        }
 
@@ -5739,7 +5740,7 @@ static bool proj_paint_add_slot(bContext *C, wmOperator *op)
                        BKE_texpaint_slot_refresh_cache(scene, ma);
                        BKE_image_signal(ima, NULL, IMA_SIGNAL_USER_NEW_IMAGE);
                        WM_event_add_notifier(C, NC_IMAGE | NA_ADDED, ima);
-                       DAG_id_tag_update(&ma->id, 0);
+                       DEG_id_tag_update(&ma->id, 0);
                        ED_area_tag_redraw(CTX_wm_area(C));
                        
                        BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
@@ -5855,7 +5856,7 @@ static int texture_paint_delete_texture_paint_slot_exec(bContext *C, wmOperator
        ma->mtex[slot->index] = NULL;
        
        BKE_texpaint_slot_refresh_cache(scene, ma);
-       DAG_id_tag_update(&ma->id, 0);
+       DEG_id_tag_update(&ma->id, 0);
        WM_event_add_notifier(C, NC_MATERIAL, ma);
        /* we need a notifier for data change since we change the displayed modifier uvs */
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
@@ -5913,7 +5914,7 @@ static int add_simple_uvs_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
        
-       DAG_id_tag_update(ob->data, 0);
+       DEG_id_tag_update(ob->data, 0);
        WM_event_add_notifier(C, NC_GEOM | ND_DATA, ob->data);
        WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, scene);
        return OPERATOR_FINISHED;
index efd1f0914c735e56f291072d1de649ba5a86843f..98bf0aa0a66489bd7abfd9a06e6ff0acab647e16 100644 (file)
@@ -57,7 +57,6 @@
 #include "BKE_action.h"
 #include "BKE_brush.h"
 #include "BKE_context.h"
-#include "BKE_depsgraph.h"
 #include "BKE_deform.h"
 #include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
@@ -67,6 +66,8 @@
 #include "BKE_report.h"
 #include "BKE_colortools.h"
 
+#include "DEG_depsgraph.h"
+
 #include "WM_api.h"
 #include "WM_types.h"
 
@@ -262,7 +263,7 @@ static bool make_vertexcol(Object *ob)  /* single ob */
                BKE_mesh_update_customdata_pointers(me, true);
        }
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
        
        return (me->mloopcol != NULL);
 }
@@ -365,7 +366,7 @@ bool ED_vpaint_fill(Object *ob, unsigned int paintcol)
        /* remove stale me->mcol, will be added later */
        BKE_mesh_tessface_clear(me);
 
-       DAG_id_tag_update(&me->id, 0);
+       DEG_id_tag_update(&me->id, 0);
 
        return true;
 }