blender
/
blender
133
398
Fork 579
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: macros using _END, should have a _BEGIN 

Also use var names not likely to be shadowed.
This commit is contained in:
Campbell Barton 2018-02-28 10:05:38 +11:00
parent 000002e42d
commit bc71aa5a4c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/render/intern/include/render_result.h
View File

@ -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; \
} \
} \

2
source/blender/render/intern/source/external_engine.c
View File

@ -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();

2
source/blender/render/intern/source/render_result.c
View File

@ -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)) {