Depsgraph: More type definitions to new depsgraph header

source/blender/blenkernel/BKE_depsgraph.h

@@ -50,35 +50,6 @@ struct Main;
 struct Object;
 struct Scene;
 
-/* Dependency graph evaluation context
- *
- * This structure stores all the local dependency graph data,
- * which is needed for it's evaluation,
- */
-typedef struct EvaluationContext {
-	int mode;               /* evaluation mode */
-	float ctime;            /* evaluation time */
-} EvaluationContext;
-
-typedef enum eEvaluationMode {
-	DAG_EVAL_VIEWPORT       = 0,    /* evaluate for OpenGL viewport */
-	DAG_EVAL_PREVIEW        = 1,    /* evaluate for render with preview settings */
-	DAG_EVAL_RENDER         = 2,    /* evaluate for render purposes */
-} eEvaluationMode;
-
-/* DagNode->eval_flags */
-enum {
-	/* Regardless to curve->path animation flag path is to be evaluated anyway,
-	 * to meet dependencies with such a things as curve modifier and other guys
-	 * who're using curve deform, where_on_path and so.
-	 */
-	DAG_EVAL_NEED_CURVE_PATH = 1,
-	/* Scene evaluation would need to have object's data on CPU,
-	 * meaning no GPU shortcuts is allowed.
-	 */
-	DAG_EVAL_NEED_CPU        = 2,
-};
-
 /* Global initialization/deinitialization */
 void DAG_init(void);
 void DAG_exit(void);

source/blender/blenkernel/intern/DerivedMesh.c

@@ -81,6 +81,7 @@ static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
 
 #ifdef WITH_OPENSUBDIV
 #  include "BKE_depsgraph.h"
+#  include "DEG_depsgraph.h"
 #  include "DNA_userdef_types.h"
 #endif
 

source/blender/blenkernel/intern/anim_sys.c

@@ -70,6 +70,8 @@
 #include "BKE_report.h"
 #include "BKE_texture.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "nla_private.h"

source/blender/blenkernel/intern/curve.c

@@ -64,6 +64,8 @@
 #include "BKE_object.h"
 #include "BKE_material.h"
 
+#include "DEG_depsgraph.h"
+
 /* globals */
 
 /* local */

source/blender/blenkernel/intern/displist.c

@@ -63,6 +63,8 @@
 
 #include "BLI_sys_types.h" // for intptr_t support
 
+#include "DEG_depsgraph.h"
+
 static void boundbox_displist_object(Object *ob);
 
 void BKE_displist_elem_free(DispList *dl)

source/blender/blenkernel/intern/group.c

@@ -55,6 +55,8 @@
 #include "BKE_object.h"
 #include "BKE_scene.h" /* BKE_scene_base_find */
 
+#include "DEG_depsgraph.h"
+
 static void free_group_object(GroupObject *go)
 {
 	MEM_freeN(go);

source/blender/blenkernel/intern/lattice.c

@@ -67,6 +67,8 @@
 
 #include "BKE_deform.h"
 
+#include "DEG_depsgraph.h"
+
 /* Workaround for cyclic dependency with curves.
  * In such case curve_cache might not be ready yet,
  */

source/blender/blenkernel/intern/layer.c

@@ -40,6 +40,8 @@
 #include "BKE_main.h"
 #include "BKE_node.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DNA_ID.h"
 #include "DNA_layer_types.h"
 #include "DNA_object_types.h"

source/blender/blenkernel/intern/mball.c

@@ -67,6 +67,8 @@
 #include "BKE_object.h"
 #include "BKE_material.h"
 
+#include "DEG_depsgraph.h"
+
 /* Functions */
 
 /** Free (or release) any data used by this mball (does not free the mball itself). */

source/blender/blenkernel/intern/mball_tessellate.c

@@ -53,6 +53,8 @@
 #include "BKE_displist.h"
 #include "BKE_mball_tessellate.h"  /* own include */
 
+#include "DEG_depsgraph.h"
+
 #include "BLI_strict_flags.h"
 
 /* experimental (faster) normal calculation */

source/blender/blenkernel/intern/object.c

@@ -119,6 +119,8 @@
 #include "BKE_camera.h"
 #include "BKE_image.h"
 
+#include "DEG_depsgraph.h"
+
 #include "DRW_engine.h"
 
 #ifdef WITH_MOD_FLUID

source/blender/blenkernel/intern/object_dupli.c

@@ -62,6 +62,7 @@
 #include "BKE_editmesh.h"
 #include "BKE_anim.h"
 
+#include "DEG_depsgraph.h"
 
 #include "BLI_strict_flags.h"
 

source/blender/blenkernel/intern/particle_system.c

@@ -90,6 +90,8 @@
 #include "BKE_bvhutils.h"
 #include "BKE_depsgraph.h"
 
+#include "DEG_depsgraph.h"
+
 #include "PIL_time.h"
 
 #include "RE_shader_ext.h"

source/blender/blenkernel/intern/rigidbody.c

@@ -66,6 +66,8 @@
 #include "BKE_rigidbody.h"
 #include "BKE_scene.h"
 
+#include "DEG_depsgraph.h"
+
 /* ************************************** */
 /* Memory Management */
 

source/blender/blenkernel/intern/sequencer.c

@@ -76,6 +76,8 @@
 #include "BKE_library.h"
 #include "BKE_idprop.h"
 
+#include "DEG_depsgraph.h"
+
 #include "RNA_access.h"
 
 #include "RE_pipeline.h"

source/blender/depsgraph/DEG_depsgraph.h

@@ -66,6 +66,35 @@ struct Main;
 struct PointerRNA;
 struct PropertyRNA;
 
+/* Dependency graph evaluation context
+ *
+ * This structure stores all the local dependency graph data,
+ * which is needed for it's evaluation,
+ */
+typedef struct EvaluationContext {
+	int mode;               /* evaluation mode */
+	float ctime;            /* evaluation time */
+} EvaluationContext;
+
+typedef enum eEvaluationMode {
+	DAG_EVAL_VIEWPORT       = 0,    /* evaluate for OpenGL viewport */
+	DAG_EVAL_PREVIEW        = 1,    /* evaluate for render with preview settings */
+	DAG_EVAL_RENDER         = 2,    /* evaluate for render purposes */
+} eEvaluationMode;
+
+/* DagNode->eval_flags */
+enum {
+	/* Regardless to curve->path animation flag path is to be evaluated anyway,
+	 * to meet dependencies with such a things as curve modifier and other guys
+	 * who're using curve deform, where_on_path and so.
+	 */
+	DAG_EVAL_NEED_CURVE_PATH = 1,
+	/* Scene evaluation would need to have object's data on CPU,
+	 * meaning no GPU shortcuts is allowed.
+	 */
+	DAG_EVAL_NEED_CPU        = 2,
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif

source/blender/makesrna/intern/rna_object_api.c

@@ -47,6 +47,8 @@
 #include "BKE_depsgraph.h"
 #include "BKE_layer.h"
 
+#include "DEG_depsgraph.h"
+
 #include "rna_internal.h"  /* own include */
 
 static EnumPropertyItem space_items[] = {
@@ -90,8 +92,6 @@ static EnumPropertyItem space_items[] = {
 
 #include "MEM_guardedalloc.h"
 
-#include "DEG_depsgraph.h"
-
 static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports, int action)
 {
 	SceneLayer *sl = CTX_data_scene_layer(C);

source/blender/modifiers/intern/MOD_array.c

@@ -54,6 +54,8 @@
 
 #include "MOD_util.h"
 
+#include "DEG_depsgraph.h"
+
 /* Due to cyclic dependencies it's possible that curve used for
  * deformation here is not evaluated at the time of evaluating
  * this modifier.

source/blender/modifiers/intern/MOD_curve.c

@@ -46,6 +46,7 @@
 #include "BKE_library_query.h"
 #include "BKE_modifier.h"
 
+#include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
 
 static void initData(ModifierData *md)

source/blender/modifiers/intern/MOD_subsurf.c

@@ -50,6 +50,8 @@
 #include "BKE_scene.h"
 #include "BKE_subsurf.h"
 
+#include "DEG_depsgraph.h"
+
 #include "MOD_modifiertypes.h"
 
 #include "intern/CCGSubSurf.h"