[Bf-blender-cvs] [73b55a5508c] master: Cleanup: style, use braces for draw
Campbell Barton
noreply at git.blender.org
Wed Mar 27 15:18:02 CET 2019
Commit: 73b55a5508c6f3e9bb7b59d2d903ac584518eccc
Author: Campbell Barton
Date: Thu Mar 28 01:11:28 2019 +1100
Branches: master
https://developer.blender.org/rB73b55a5508c6f3e9bb7b59d2d903ac584518eccc
Cleanup: style, use braces for draw
===================================================================
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/draw/engines/workbench/workbench_studiolight.c
M source/blender/draw/intern/draw_armature.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_manager_data.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/intern/draw_manager_profiling.c
M source/blender/draw/modes/edit_mesh_mode_text.c
M source/blender/draw/modes/edit_metaball_mode.c
===================================================================
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index cde8793c8bf..ad000e0d4c3 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -319,31 +319,49 @@ static void eevee_draw_background(void *vedata)
/* Debug : Output buffer to view. */
switch (G.debug_value) {
case 1:
- if (txl->maxzbuffer) DRW_transform_to_display(txl->maxzbuffer, false, false);
+ if (txl->maxzbuffer) {
+ DRW_transform_to_display(txl->maxzbuffer, false, false);
+ }
break;
case 2:
- if (effects->ssr_pdf_output) DRW_transform_to_display(effects->ssr_pdf_output, false, false);
+ if (effects->ssr_pdf_output) {
+ DRW_transform_to_display(effects->ssr_pdf_output, false, false);
+ }
break;
case 3:
- if (effects->ssr_normal_input) DRW_transform_to_display(effects->ssr_normal_input, false, false);
+ if (effects->ssr_normal_input) {
+ DRW_transform_to_display(effects->ssr_normal_input, false, false);
+ }
break;
case 4:
- if (effects->ssr_specrough_input) DRW_transform_to_display(effects->ssr_specrough_input, false, false);
+ if (effects->ssr_specrough_input) {
+ DRW_transform_to_display(effects->ssr_specrough_input, false, false);
+ }
break;
case 5:
- if (txl->color_double_buffer) DRW_transform_to_display(txl->color_double_buffer, false, false);
+ if (txl->color_double_buffer) {
+ DRW_transform_to_display(txl->color_double_buffer, false, false);
+ }
break;
case 6:
- if (effects->gtao_horizons_debug) DRW_transform_to_display(effects->gtao_horizons_debug, false, false);
+ if (effects->gtao_horizons_debug) {
+ DRW_transform_to_display(effects->gtao_horizons_debug, false, false);
+ }
break;
case 7:
- if (effects->gtao_horizons) DRW_transform_to_display(effects->gtao_horizons, false, false);
+ if (effects->gtao_horizons) {
+ DRW_transform_to_display(effects->gtao_horizons, false, false);
+ }
break;
case 8:
- if (effects->sss_data) DRW_transform_to_display(effects->sss_data, false, false);
+ if (effects->sss_data) {
+ DRW_transform_to_display(effects->sss_data, false, false);
+ }
break;
case 9:
- if (effects->velocity_tx) DRW_transform_to_display(effects->velocity_tx, false, false);
+ if (effects->velocity_tx) {
+ DRW_transform_to_display(effects->velocity_tx, false, false);
+ }
break;
default:
break;
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index ae1634b9d9c..b66563de80a 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -222,8 +222,12 @@ static GPUShader *eevee_lights_get_store_sh(int shadow_method, bool high_blur, b
ds_frag = BLI_dynstr_new();
BLI_dynstr_append(ds_frag, (shadow_method == SHADOW_VSM) ? "#define VSM\n" : "#define ESM\n");
- if (high_blur) BLI_dynstr_append(ds_frag, "#define HIGH_BLUR\n");
- if (cascade) BLI_dynstr_append(ds_frag, "#define CSM\n");
+ if (high_blur) {
+ BLI_dynstr_append(ds_frag, "#define HIGH_BLUR\n");
+ }
+ if (cascade) {
+ BLI_dynstr_append(ds_frag, "#define CSM\n");
+ }
char *define_str = BLI_dynstr_get_cstring(ds_frag);
BLI_dynstr_free(ds_frag);
@@ -444,7 +448,9 @@ void EEVEE_lights_cache_shcaster_material_add(
/* TODO / PERF : reuse the same shading group for objects with the same material */
DRWShadingGroup *grp = DRW_shgroup_material_create(gpumat, psl->shadow_pass);
- if (grp == NULL) return;
+ if (grp == NULL) {
+ return;
+ }
/* Grrr needed for correctness but not 99% of the time not needed.
* TODO detect when needed? */
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 15b3457874d..ad49d3f8ae7 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -723,13 +723,27 @@ struct GPUMaterial *EEVEE_material_mesh_get(
const void *engine = &DRW_engine_viewport_eevee_type;
int options = VAR_MAT_MESH;
- if (use_blend) options |= VAR_MAT_BLEND;
- if (use_multiply) options |= VAR_MAT_MULT;
- if (use_refract) options |= VAR_MAT_REFRACT;
- if (use_sss) options |= VAR_MAT_SSS;
- if (use_sss && effects->sss_separate_albedo) options |= VAR_MAT_SSSALBED;
- if (use_translucency) options |= VAR_MAT_TRANSLUC;
- if (((effects->enabled_effects & EFFECT_VOLUMETRIC) != 0) && use_blend) options |= VAR_MAT_VOLUME;
+ if (use_blend) {
+ options |= VAR_MAT_BLEND;
+ }
+ if (use_multiply) {
+ options |= VAR_MAT_MULT;
+ }
+ if (use_refract) {
+ options |= VAR_MAT_REFRACT;
+ }
+ if (use_sss) {
+ options |= VAR_MAT_SSS;
+ }
+ if (use_sss && effects->sss_separate_albedo) {
+ options |= VAR_MAT_SSSALBED;
+ }
+ if (use_translucency) {
+ options |= VAR_MAT_TRANSLUC;
+ }
+ if (((effects->enabled_effects & EFFECT_VOLUMETRIC) != 0) && use_blend) {
+ options |= VAR_MAT_VOLUME;
+ }
options |= eevee_material_shadow_option(shadow_method);
@@ -852,10 +866,18 @@ static struct DRWShadingGroup *EEVEE_default_shading_group_create(
ssr_id = (use_ssr) ? 1 : -1;
int options = VAR_MAT_MESH;
- if (is_hair) options |= VAR_MAT_HAIR;
- if (is_flat_normal) options |= VAR_MAT_FLAT;
- if (use_blend) options |= VAR_MAT_BLEND;
- if (((effects->enabled_effects & EFFECT_VOLUMETRIC) != 0) && use_blend) options |= VAR_MAT_VOLUME;
+ if (is_hair) {
+ options |= VAR_MAT_HAIR;
+ }
+ if (is_flat_normal) {
+ options |= VAR_MAT_FLAT;
+ }
+ if (use_blend) {
+ options |= VAR_MAT_BLEND;
+ }
+ if (((effects->enabled_effects & EFFECT_VOLUMETRIC) != 0) && use_blend) {
+ options |= VAR_MAT_VOLUME;
+ }
options |= eevee_material_shadow_option(shadow_method);
@@ -883,8 +905,12 @@ static struct DRWShadingGroup *EEVEE_default_shading_group_get(
BLI_assert(!is_hair || (ob && psys && md));
- if (is_hair) options |= VAR_MAT_HAIR;
- if (is_flat_normal) options |= VAR_MAT_FLAT;
+ if (is_hair) {
+ options |= VAR_MAT_HAIR;
+ }
+ if (is_flat_normal) {
+ options |= VAR_MAT_FLAT;
+ }
options |= eevee_material_shadow_option(shadow_method);
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 781fbabccb7..384f25ecaa5 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -721,8 +721,12 @@ static int gpencil_object_cache_compare_zdepth(const void *a1, const void *a2)
{
const tGPencilObjectCache *ps1 = a1, *ps2 = a2;
- if (ps1->zdepth < ps2->zdepth) return 1;
- else if (ps1->zdepth > ps2->zdepth) return -1;
+ if (ps1->zdepth < ps2->zdepth) {
+ return 1;
+ }
+ else if (ps1->zdepth > ps2->zdepth) {
+ return -1;
+ }
return 0;
}
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c
index 0890f50c0df..f382ad31752 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -276,8 +276,8 @@ bool studiolight_camera_in_object_shadow(WORKBENCH_PrivateData *wpd, Object *ob,
for (int j = 0; j < 4; ++j) {
float dst = dot_v2v2(wpd->shadow_near_sides[i], pts[j]);
/* Do min max */
- if (min_dst > dst) min_dst = dst;
- if (max_dst < dst) max_dst = dst;
+ if (min_dst > dst) { min_dst = dst; }
+ if (max_dst < dst) { max_dst = dst; }
}
if ((wpd->shadow_near_sides[i][2] > max_dst) ||
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index a26313a1402..13d9be9825e 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -643,10 +643,10 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const
{
if ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS)) {
uchar cp[4];
- if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 80);
- else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 80);
- else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 80);
- else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 80);
+ if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 80); }
+ else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 80); }
+ else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 80); }
+ else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 80); }
else {
return false;
}
@@ -726,11 +726,11 @@ static bool set_pchan_color(short colCode, const int boneflag, const short const
/* inner part in background color or constraint */
if ((constflag) && ((bcolor == NULL) || (bcolor->flag & TH_WIRECOLOR_CONSTCOLS))) {
uchar cp[4];
- if (constflag & PCHAN_HAS_TARGET) rgba_char_args_set((char *)cp, 255, 150, 0, 255);
- else if (constflag & PCHAN_HAS_IK) rgba_char_args_set((char *)cp, 255, 255, 0, 255);
- else if (constflag & PCHAN_HAS_SPLINEIK) rgba_char_args_set((char *)cp, 200, 255, 0, 255);
- else if (constflag & PCHAN_HAS_CONST) rgba_char_args_set((char *)cp, 0, 255, 120, 255);
- else if (constflag) UI_GetThemeColor4ubv(TH_BONE_POSE, cp); /* PCHAN_HAS_ACTION */
+ if (constflag & PCHAN_HAS_TARGET) { rgba_char_args_set((char *)cp, 255, 150, 0, 255); }
+ else if (constflag & PCHAN_HAS_IK) { rgba_char_args_set((char *)cp, 255, 255, 0, 255); }
+ else if (constflag & PCHAN_HAS_SPLINEIK) { rgba_char_args_set((char *)cp, 200, 255, 0, 255); }
+ else if (constflag & PCHAN_HAS_CONST) { rgba_char_args_set((char *)cp, 0, 255, 120, 255); }
+ else if (constflag) { UI_GetThemeColor4ubv(TH_BONE_POSE, cp); } /* PCHAN_HAS_ACTION */
rgb_uchar_to_float(fcolor, cp);
}
@@ -1656,7 +1656,9 @@ static void pchan_draw_ik_lines(
while (parchan->parent) {
segcount++;
/* FIXME: revise the breaking conditions */
- if (segcount ==
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list