Commit: bc71aa5a4c5e0ce961803d7d0b7649ad6d384006
Author: Campbell Barton
Date: Wed Feb 28 10:05:38 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBbc71aa5a4c5e0ce961803d7d0b7649ad6d384006
Cleanup: macros using _END, should have a _BEGIN
Also use var names not likely to be shadowed.
===================================================================
M source/blender/render/intern/include/render_result.h
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/render_result.c
===================================================================
diff --git a/source/blender/render/intern/include/render_result.h
b/source/blender/render/intern/include/render_result.h
index b2c5758f506..23db993a1a9 100644
--- a/source/blender/render/intern/include/render_result.h
+++ b/source/blender/render/intern/include/render_result.h
@@ -117,16 +117,16 @@ void render_result_views_shallowcopy(struct RenderResult
*dst, struct RenderResu
void render_result_views_shallowdelete(struct RenderResult *rr);
bool render_result_has_views(struct RenderResult *rr);
-#define FOREACH_VIEW_LAYER_TO_RENDER(re_, iter_) \
+#define FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re_, iter_) \
{ \
- int nr; \
+ int nr_; \
ViewLayer *iter_; \
- for (nr = 0, iter_ = (re_)->view_layers.first; \
+ for (nr_ = 0, iter_ = (re_)->view_layers.first; \
iter_ != NULL; \
- iter_ = iter_->next, nr++) \
+ iter_ = iter_->next, nr_++) \
{ \
if ((re_)->r.scemode & R_SINGLE_LAYER) { \
- if (nr != re->active_view_layer) { \
+ if (nr_ != re->active_view_layer) { \
continue; \
} \
} \
diff --git a/source/blender/render/intern/source/external_engine.c
b/source/blender/render/intern/source/external_engine.c
index 1b8ab4d8121..9b384709f35 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -754,7 +754,7 @@ int RE_engine_render(Render *re, int do_all)
}
if (type->render_to_image) {
- FOREACH_VIEW_LAYER_TO_RENDER(re, view_layer_iter)
+ FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re, view_layer_iter)
{
EvaluationContext *eval_ctx =
DEG_evaluation_context_new(DAG_EVAL_RENDER);
Depsgraph *depsgraph = DEG_graph_new();
diff --git a/source/blender/render/intern/source/render_result.c
b/source/blender/render/intern/source/render_result.c
index 126d675a491..e46c74a3620 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -294,7 +294,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct,
int crop, int savebuf
render_result_views_new(rr, &re->r);
/* check renderdata for amount of layers */
- FOREACH_VIEW_LAYER_TO_RENDER(re, view_layer)
+ FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re, view_layer)
{
if (layername && layername[0]) {
if (!STREQ(view_layer->name, layername)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
