archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

More clean of macros with an _END and no _BEGIN

Browse Source 
Follow up on 7aed2de798.
This commit is contained in:
Dalai Felinto
2018-03-01 12:21:56 -03:00
parent f242f3e75b
commit 8f7e3600d1
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/depsgraph/DEG_depsgraph_query.h
View File

@@ -144,14 +144,14 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter);
/** /**
* Depsgraph objects iterator for draw manager and final render * Depsgraph objects iterator for draw manager and final render
*/ */
#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE(graph_, instance_, mode_) \ #define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(graph_, instance_, mode_) \
DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_, \ DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_, \
DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | \ DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | \
DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET | \ DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET | \
DEG_ITER_OBJECT_FLAG_VISIBLE | \ DEG_ITER_OBJECT_FLAG_VISIBLE | \
DEG_ITER_OBJECT_FLAG_DUPLI) 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_OBJECT_ITER_END
/* ************************ DEG traversal ********************* */ /* ************************ DEG traversal ********************* */

6
source/blender/draw/intern/draw_manager.c
View File

@@ -1087,7 +1087,7 @@ void DRW_draw_render_loop_ex(
PROFILE_START(stime); PROFILE_START(stime);
drw_engines_cache_init(); 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); drw_engines_cache_populate(ob);
} }
@@ -1331,7 +1331,7 @@ void DRW_render_object_iter(
void *vedata, RenderEngine *engine, struct Depsgraph *depsgraph, void *vedata, RenderEngine *engine, struct Depsgraph *depsgraph,
void (*callback)(void *vedata, Object *ob, 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; DST.ob_state = NULL;
callback(vedata, ob, engine, depsgraph); callback(vedata, ob, engine, depsgraph);
@@ -1636,7 +1636,7 @@ void DRW_draw_depth_loop(
if (cache_is_dirty) { if (cache_is_dirty) {
drw_engines_cache_init(); 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); drw_engines_cache_populate(ob);
} }