[Bf-blender-cvs] [8f7e3600d1d] blender2.8: More clean of macros with an _END and no _BEGIN

[Dalai Felinto]

Commit: 8f7e3600d1de281cea2d89e7afc110c86101d51c
Author: Dalai Felinto
Date:   Thu Mar 1 12:21:56 2018 -0300
Branches: blender2.8
https://developer.blender.org/rB8f7e3600d1de281cea2d89e7afc110c86101d51c

More clean of macros with an _END and no _BEGIN

Follow up on 7aed2de798b1e5f8663e.

===================================================================

M	source/blender/depsgraph/DEG_depsgraph_query.h
M	source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index 1571e9edf73..ab295b7cbb2 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -144,14 +144,14 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter);
 /**
   * Depsgraph objects iterator for draw manager and final render
   */
-#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE(graph_, instance_, mode_) \
-	DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_,                \
-	        DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY  |          \
-	        DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET |            \
-	        DEG_ITER_OBJECT_FLAG_VISIBLE |                   \
+#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(graph_, instance_, mode_) \
+	DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_,                       \
+	        DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY |                        \
+	        DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET |                         \
+	        DEG_ITER_OBJECT_FLAG_VISIBLE |                                \
 	        DEG_ITER_OBJECT_FLAG_DUPLI)
 
-#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END                \
+#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END                             \
 	DEG_OBJECT_ITER_END
 
 /* ************************ DEG traversal ********************* */
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 7b60f7a0646..aa0ddd0d31b 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1087,7 +1087,7 @@ void DRW_draw_render_loop_ex(
 		PROFILE_START(stime);
 		drw_engines_cache_init();
 
-		DEG_OBJECT_ITER_FOR_RENDER_ENGINE(depsgraph, ob, DRW_iterator_mode_get())
+		DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob, DRW_iterator_mode_get())
 		{
 			drw_engines_cache_populate(ob);
 		}
@@ -1331,7 +1331,7 @@ void DRW_render_object_iter(
 	void *vedata, RenderEngine *engine, struct Depsgraph *depsgraph,
 	void (*callback)(void *vedata, Object *ob, RenderEngine *engine, struct Depsgraph *depsgraph))
 {
-	DEG_OBJECT_ITER_FOR_RENDER_ENGINE(depsgraph, ob, DRW_iterator_mode_get())
+	DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob, DRW_iterator_mode_get())
 	{
 		DST.ob_state = NULL;
 		callback(vedata, ob, engine, depsgraph);
@@ -1636,7 +1636,7 @@ void DRW_draw_depth_loop(
 	if (cache_is_dirty) {
 		drw_engines_cache_init();
 
-		DEG_OBJECT_ITER_FOR_RENDER_ENGINE(depsgraph, ob, DRW_iterator_mode_get())
+		DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob, DRW_iterator_mode_get())
 		{
 			drw_engines_cache_populate(ob);
 		}