[Bf-blender-cvs] [f24bb62fc2b] master: Cleanup: style, use braces for render
Campbell Barton
noreply at git.blender.org
Mon Apr 22 13:15:19 CEST 2019
Commit: f24bb62fc2b869f0798a98400ac488d6d6067b71
Author: Campbell Barton
Date: Mon Apr 22 09:08:06 2019 +1000
Branches: master
https://developer.blender.org/rBf24bb62fc2b869f0798a98400ac488d6d6067b71
Cleanup: style, use braces for render
===================================================================
M source/blender/render/intern/source/bake_api.c
M source/blender/render/intern/source/external_engine.c
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/initrender.c
M source/blender/render/intern/source/multires_bake.c
M source/blender/render/intern/source/pipeline.c
M source/blender/render/intern/source/pointdensity.c
M source/blender/render/intern/source/render_result.c
M source/blender/render/intern/source/render_texture.c
M source/blender/render/intern/source/zbuf.c
===================================================================
diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c
index e71d5b5f14c..d7080906d5c 100644
--- a/source/blender/render/intern/source/bake_api.c
+++ b/source/blender/render/intern/source/bake_api.c
@@ -139,8 +139,9 @@ static void store_bake_pixel(void *handle, int x, int y, float u, float v)
void RE_bake_mask_fill(const BakePixel pixel_array[], const size_t num_pixels, char *mask)
{
size_t i;
- if (!mask)
+ if (!mask) {
return;
+ }
/* only extend to pixels outside the mask area */
for (i = 0; i < num_pixels; i++) {
@@ -155,9 +156,10 @@ void RE_bake_margin(ImBuf *ibuf, char *mask, const int margin)
/* margin */
IMB_filter_extend(ibuf, mask, margin);
- if (ibuf->planes != R_IMF_PLANES_RGBA)
+ if (ibuf->planes != R_IMF_PLANES_RGBA) {
/* clear alpha added by filtering */
IMB_rectfill_alpha(ibuf, 1.0f);
+ }
}
/**
@@ -690,8 +692,9 @@ void RE_bake_pixels_populate(Mesh *me,
mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id);
}
- if (mloopuv == NULL)
+ if (mloopuv == NULL) {
return;
+ }
bd.pixel_array = pixel_array;
bd.zspan = MEM_callocN(sizeof(ZSpan) * bake_images->size, "bake zspan");
@@ -757,8 +760,9 @@ void RE_bake_pixels_populate(Mesh *me,
static void normal_uncompress(float out[3], const float in[3])
{
int i;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < 3; i++) {
out[i] = 2.0f * in[i] - 1.0f;
+ }
}
static void normal_compress(float out[3],
@@ -849,10 +853,12 @@ void RE_bake_normal_world_to_tangent(const BakePixel pixel_array[],
offset = i * depth;
if (primitive_id == -1) {
- if (depth == 4)
+ if (depth == 4) {
copy_v4_fl4(&result[offset], 0.5f, 0.5f, 1.0f, 1.0f);
- else
+ }
+ else {
copy_v3_fl3(&result[offset], 0.5f, 0.5f, 1.0f);
+ }
continue;
}
@@ -862,10 +868,12 @@ void RE_bake_normal_world_to_tangent(const BakePixel pixel_array[],
for (j = 0; j < 3; j++) {
const TSpace *ts;
- if (is_smooth)
+ if (is_smooth) {
normal_short_to_float_v3(normals[j], triangle->mverts[j]->no);
- else
+ }
+ else {
normal[j] = triangle->normal[j];
+ }
ts = triangle->tspace[j];
copy_v3_v3(tangents[j], ts->tangent);
@@ -877,8 +885,9 @@ void RE_bake_normal_world_to_tangent(const BakePixel pixel_array[],
w = 1.0f - u - v;
/* normal */
- if (is_smooth)
+ if (is_smooth) {
interp_barycentric_tri_v3(normals, u, v, normal);
+ }
/* tangent */
interp_barycentric_tri_v3(tangents, u, v, tangent);
@@ -936,8 +945,9 @@ void RE_bake_normal_world_to_object(const BakePixel pixel_array[],
size_t offset;
float nor[3];
- if (pixel_array[i].primitive_id == -1)
+ if (pixel_array[i].primitive_id == -1) {
continue;
+ }
offset = i * depth;
normal_uncompress(nor, &result[offset]);
@@ -963,8 +973,9 @@ void RE_bake_normal_world_to_world(const BakePixel pixel_array[],
size_t offset;
float nor[3];
- if (pixel_array[i].primitive_id == -1)
+ if (pixel_array[i].primitive_id == -1) {
continue;
+ }
offset = i * depth;
normal_uncompress(nor, &result[offset]);
@@ -987,10 +998,12 @@ void RE_bake_ibuf_clear(Image *image, const bool is_tangent)
ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
BLI_assert(ibuf);
- if (is_tangent)
+ if (is_tangent) {
IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? nor_alpha : nor_solid);
- else
+ }
+ else {
IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? vec_alpha : vec_solid);
+ }
BKE_image_release_ibuf(image, ibuf, lock);
}
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 744595305d9..9a955b5e8f5 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -85,8 +85,9 @@ void RE_engines_exit(void)
BLI_remlink(&R_engines, type);
if (!(type->flag & RE_INTERNAL)) {
- if (type->ext.free)
+ if (type->ext.free) {
type->ext.free(type->ext.data);
+ }
MEM_freeN(type);
}
@@ -106,8 +107,9 @@ RenderEngineType *RE_engines_find(const char *idname)
RenderEngineType *type;
type = BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname));
- if (!type)
+ if (!type) {
type = BLI_findstring(&R_engines, "BLENDER_EEVEE", offsetof(RenderEngineType, idname));
+ }
return type;
}
@@ -194,10 +196,12 @@ RenderResult *RE_engine_begin_result(
CLAMP(w, 0, re->result->rectx);
CLAMP(h, 0, re->result->recty);
- if (x + w > re->result->rectx)
+ if (x + w > re->result->rectx) {
w = re->result->rectx - x;
- if (y + h > re->result->recty)
+ }
+ if (y + h > re->result->recty) {
h = re->result->recty - y;
+ }
/* allocate a render result */
disprect.xmin = x;
@@ -229,8 +233,9 @@ RenderResult *RE_engine_begin_result(
pa = get_part_from_result(re, result);
- if (pa)
+ if (pa) {
pa->status = PART_STATUS_IN_PROGRESS;
+ }
}
return result;
@@ -291,8 +296,9 @@ void RE_engine_end_result(
render_result_exr_file_merge(re->result, result, re->viewname);
}
}
- else if (!(re->test_break(re->tbh) && (re->r.scemode & R_BUTS_PREVIEW)))
+ else if (!(re->test_break(re->tbh) && (re->r.scemode & R_BUTS_PREVIEW))) {
render_result_merge(re->result, result);
+ }
/* draw */
if (!re->test_break(re->tbh)) {
@@ -317,8 +323,9 @@ bool RE_engine_test_break(RenderEngine *engine)
{
Render *re = engine->re;
- if (re)
+ if (re) {
return re->test_break(re->tbh);
+ }
return 0;
}
@@ -341,12 +348,15 @@ void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char
/* set engine text */
engine->text[0] = '\0';
- if (stats && stats[0] && info && info[0])
+ if (stats && stats[0] && info && info[0]) {
BLI_snprintf(engine->text, sizeof(engine->text), "%s | %s", stats, info);
- else if (info && info[0])
+ }
+ else if (info && info[0]) {
BLI_strncpy(engine->text, info, sizeof(engine->text));
- else if (stats && stats[0])
+ }
+ else if (stats && stats[0]) {
BLI_strncpy(engine->text, stats, sizeof(engine->text));
+ }
}
void RE_engine_update_progress(RenderEngine *engine, float progress)
@@ -373,10 +383,12 @@ void RE_engine_report(RenderEngine *engine, int type, const char *msg)
{
Render *re = engine->re;
- if (re)
+ if (re) {
BKE_report(engine->re->reports, type, msg);
- else if (engine->reports)
+ }
+ else if (engine->reports) {
BKE_report(engine->reports, type, msg);
+ }
}
void RE_engine_set_error_message(RenderEngine *engine, const char *msg)
@@ -412,8 +424,9 @@ float RE_engine_get_camera_shift_x(RenderEngine *engine, Object *camera, bool us
/* When using spherical stereo, get camera shift without multiview,
* leaving stereo to be handled by the engine. */
- if (use_spherical_stereo)
+ if (use_spherical_stereo) {
re = NULL;
+ }
return BKE_camera_multiview_shift_x(re ? &re->r : NULL, camera, re->viewname);
}
@@ -427,8 +440,9 @@ void RE_engine_get_camera_model_matrix(RenderEngine *engine,
/* When using spherical stereo, get model matrix without multiview,
* leaving stereo to be handled by the engine. */
- if (use_spherical_stereo)
+ if (use_spherical_stereo) {
re = NULL;
+ }
BKE_camera_multiview_model_matrix(
re ? &re->r : NULL, camera, re->viewname, (float(*)[4])r_modelmat);
@@ -593,8 +607,9 @@ bool RE_bake_engine(Render *re,
engine->depsgraph = depsgraph;
/* update is only called so we create the engine.session */
- if (type->update)
+ if (type->update) {
type->update(engine, re->main, engine->depsgraph);
+ }
type->bake(engine,
engine->depsgraph,
@@ -625,8 +640,9 @@ bool RE_bake_engine(Render *re,
RE_parts_free(re);
BLI_rw_mutex_unlock(&re->partsmutex);
- if (BKE_reports_contain(re->reports, RPT_ERROR))
+ if (BKE_reports_contain(re->reports, RPT_ERROR)) {
G.is_break = true;
+ }
return true;
}
@@ -640,14 +656,18 @@ int RE_engine_render(Render *re, int do_all)
bool persistent_data = (re->r.mode & R_PERSISTENT_DATA) != 0;
/* verify if we can render */
- if (!type->render)
+ if (!type->render) {
return 0;
- if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW))
+ }
+ if ((re->r.scemode & R_BUTS_PREVIEW) && !(type->flag & RE_USE_PREVIEW)) {
return 0;
- if (do_all && !(type->flag & RE_USE_POSTPROCESS))
+ }
+ if (do_all && !(type->flag & RE_USE_POSTPROCESS)) {
return 0;
- if (!do_all && (type->flag & RE_USE_POSTPROCESS))
+ }
+ if (!do_all && (type->flag & RE_USE_POSTPROCESS)) {
return 0;
+ }
/* Lock drawing in UI during data phase. */
if (re->draw_lock) {
@@ -665,11 +685,13 @@ int RE_engine_render(Render *re, int do_all)
if (re->result == NULL || !(re->r.scemode & R_BUTS_PREVIEW)) {
int savebuffers = RR_USE_MEM;
- if (re->result)
+ if (re->result) {
render_result_free(re->result);
+ }
- if ((type->flag & RE_USE_SAVE_BUFFERS) && (re->r.scemode & R_EXR_TILE_FILE))
+ if ((type->flag & RE_USE_SAVE_BUFFERS) && (re->r.scemode & R_EXR_TILE_FILE)) {
savebuffers = RR_USE_EXR;
+ }
re->result = render_result_new(re, &re->disprect, 0, savebuffers, RR_ALL_LAYERS, RR_ALL_VIEWS);
}
BLI_rw_mutex_unlock(&re->resultmutex);
@@ -705,10 +727,12 @@ int RE_engine_render(Render *re, int do_all)
/* TODO: actually link to a parent which shouldn't happen */
engine->re = re;
- if (re->flag & R_ANIMATION)
+ if (re->flag & R_ANIMATION) {
engine->flag |= RE_ENGINE_ANIMATION;
- if (re->r.scemode & R_BUTS_PREVIEW)
+ }
+ if (re->r.scemode & R_BUTS_PREVIEW) {
engine->flag |= RE_ENGINE_PREVIEW;
+ }
engine->camera_override = re->camera_override;
engine->resolution_x = re->winx;
@@ -718,8 +742,9 @@ int RE_engine_render(Render *re, int do_all)
engine->tile_x = re->partx;
engine->tile_y = re->party;
- if (re->result->do
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list