Commit: 6294bd1b8bba6ac6e906eab1e7738b07264df997
Author: Dalai Felinto
Date: Fri Apr 21 11:29:47 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB6294bd1b8bba6ac6e906eab1e7738b07264df997
Depsgraph: Move DAG_get_object function
BKE_depsgraph.h will be deprecated eventually, so moving it to
DEG_depsgraph_query.h
===================================================================
M source/blender/blenkernel/BKE_depsgraph.h
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/depsgraph/DEG_depsgraph_query.h
M source/blender/depsgraph/intern/depsgraph_query.cc
M source/blender/editors/uvedit/uvedit_draw.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_depsgraph.h
b/source/blender/blenkernel/BKE_depsgraph.h
index 7da95ef01b7..363f8c82853 100644
--- a/source/blender/blenkernel/BKE_depsgraph.h
+++ b/source/blender/blenkernel/BKE_depsgraph.h
@@ -128,10 +128,6 @@ void DAG_print_dependencies(struct Main *bmain, struct
Scene *scene, struct Obje
short DAG_get_eval_flags_for_object(struct Scene *scene, void *object);
-/* ************************ DAG ********************* */
-
-struct Object *DAG_get_object(struct Depsgraph *depsgraph, struct Object *ob);
-
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/blenkernel/intern/depsgraph.c
b/source/blender/blenkernel/intern/depsgraph.c
index c83b381ead2..f99a4acd81e 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -55,16 +55,6 @@
/* ************************ DAG ********************* */
-/**
- * Get the object as properly evaluated by depsgraph.
- */
-Object *DAG_get_object(Depsgraph *depsgraph, Object *ob)
-{
- /* XXX TODO */
- UNUSED_VARS(depsgraph);
- return ob;
-}
-
/* ************************************
* This functions are to be supported *
* ************************************
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h
b/source/blender/depsgraph/DEG_depsgraph_query.h
index 4bf2b63cf41..430398c113f 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -54,6 +54,9 @@ struct Scene *DAG_get_scene(struct Depsgraph *graph);
/* Get scene layer the despgraph is created for. */
struct SceneLayer *DAG_get_scene_layer(struct Depsgraph *graph);
+/* Get the object as properly evaluated by depsgraph. */
+struct Object *DAG_get_object(struct Depsgraph *depsgraph, struct Object *ob);
+
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc
b/source/blender/depsgraph/intern/depsgraph_query.cc
index d15217c40da..0fe2d2be396 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -93,3 +93,9 @@ SceneLayer *DAG_get_scene_layer(Depsgraph *graph)
}
return NULL;
}
+
+Object *DAG_get_object(Depsgraph * /*depsgraph*/, Object *ob)
+{
+ /* XXX TODO */
+ return ob;
+}
diff --git a/source/blender/editors/uvedit/uvedit_draw.c
b/source/blender/editors/uvedit/uvedit_draw.c
index 387ccd92cba..3149abc338b 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -46,7 +46,6 @@
#include "BLI_buffer.h"
#include "BLI_bitmap.h"
-#include "BKE_depsgraph.h"
#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
#include "BKE_material.h"
@@ -56,6 +55,7 @@
#include "BIF_glutil.h"
#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
#include "GPU_immediate.h"
#include "GPU_immediate_util.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
