[Bf-blender-cvs] [122d0d15047] blender2.8: Cleanup: style
Campbell Barton
noreply at git.blender.org
Sat Apr 21 20:42:52 CEST 2018
Commit: 122d0d15047c1d84995262b1dd6488b9cb278257
Author: Campbell Barton
Date: Sat Apr 21 20:42:27 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB122d0d15047c1d84995262b1dd6488b9cb278257
Cleanup: style
===================================================================
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenlib/intern/math_color.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/modes/overlay_mode.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/gpu/GPU_framebuffer.h
M source/blender/gpu/GPU_material.h
M source/blender/gpu/intern/gpu_texture.c
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/modifiers/intern/MOD_uvproject.c
M source/blender/windowmanager/message_bus/intern/wm_message_bus_static.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 1d70980d33d..c80b5422061 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -35,7 +35,7 @@
#define BLF_BATCH_DRAW_LEN_MAX 2048 /* in glyph */
-typedef struct BatchBLF{
+typedef struct BatchBLF {
struct FontBLF *font; /* can only batch glyph from the same font */
struct Gwn_Batch *batch;
struct Gwn_VertBuf *verts;
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 27840af291b..187edd5b4a5 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -5967,12 +5967,12 @@ static int dynamicPaint_doStep(struct Depsgraph *depsgraph, Scene *scene, Object
/* Apply brush on the surface depending on it's collision type */
if (brush->psys && brush->psys->part &&
- ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
- psys_check_enabled(brushObj, brush->psys, G.is_rendering))
+ ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
+ psys_check_enabled(brushObj, brush->psys, G.is_rendering))
{
/* Paint a particle system */
BKE_animsys_evaluate_animdata(scene, &brush->psys->part->id, brush->psys->part->adt,
- BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
+ BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
dynamicPaint_paintParticles(surface, brush->psys, brush, timescale);
}
/* Object center distance: */
diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index 534abeb913d..3879a409675 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -693,22 +693,22 @@ static const float blackbody_table_b[6][4] = {
static void blackbody_temperature_to_rgb(float rgb[3], float t)
{
- if(t >= 12000.0f) {
+ if (t >= 12000.0f) {
rgb[0] = 0.826270103f;
rgb[1] = 0.994478524f;
rgb[2] = 1.56626022f;
}
- else if(t < 965.0f) {
+ else if (t < 965.0f) {
rgb[0] = 4.70366907f;
rgb[1] = 0.0f;
rgb[2] = 0.0f;
}
else {
- int i = (t >= 6365.0f)? 5:
- (t >= 3315.0f)? 4:
- (t >= 1902.0f)? 3:
- (t >= 1449.0f)? 2:
- (t >= 1167.0f)? 1: 0;
+ int i = (t >= 6365.0f) ? 5 :
+ (t >= 3315.0f) ? 4 :
+ (t >= 1902.0f) ? 3 :
+ (t >= 1449.0f) ? 2 :
+ (t >= 1167.0f) ? 1 : 0;
const float *r = blackbody_table_r[i];
const float *g = blackbody_table_g[i];
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 4a22c935b68..ff4a0351a7b 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -533,8 +533,8 @@ void do_versions_after_linking_280(Main *main)
/* Due to several changes to particle RNA and draw code particles from older files may no longer
* be visible. Here we correct this by setting a default draw size for those files. */
for (Object *object = main->object.first; object; object = object->id.next) {
- for (ParticleSystem *psys = object->particlesystem.first; psys; psys=psys->next) {
- if(psys->part->draw_size == 0.0f) {
+ for (ParticleSystem *psys = object->particlesystem.first; psys; psys = psys->next) {
+ if (psys->part->draw_size == 0.0f) {
psys->part->draw_size = 0.1f;
}
}
@@ -617,7 +617,7 @@ void do_versions_after_linking_280(Main *main)
}
}
}
- else if (object->transflag & OB_DUPLI){
+ else if (object->transflag & OB_DUPLI) {
object->duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT;
}
else {
@@ -837,7 +837,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
}
for (Group *group = main->group.first; group; group = group->id.next) {
- if (group->view_layer != NULL){
+ if (group->view_layer != NULL) {
do_version_view_layer_visibility(group->view_layer);
}
}
@@ -933,7 +933,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
/* Blender Internal removal */
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
if (STREQ(scene->r.engine, "BLENDER_RENDER") ||
- STREQ(scene->r.engine, "BLENDER_GAME")) {
+ STREQ(scene->r.engine, "BLENDER_GAME"))
+ {
BLI_strncpy(scene->r.engine, RE_engine_id_BLENDER_EEVEE, sizeof(scene->r.engine));
}
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 2c459f5ae3b..4fa7561e6c4 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -207,7 +207,7 @@ static void eevee_draw_background(void *vedata)
bool taa_use_reprojection = (stl->effects->enabled_effects & EFFECT_TAA_REPROJECT) != 0;
if (DRW_state_is_image_render() ||
- taa_use_reprojection ||
+ taa_use_reprojection ||
((stl->effects->enabled_effects & EFFECT_TAA) != 0))
{
int samp = taa_use_reprojection
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 98a4371eb4c..dea6c362afa 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -196,7 +196,7 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data
int repro_flag = 0;
if (!DRW_state_is_image_render() &&
- BKE_collection_engine_property_value_get_bool(props, "taa_reprojection"))
+ BKE_collection_engine_property_value_get_bool(props, "taa_reprojection"))
{
repro_flag = EFFECT_TAA_REPROJECT | EFFECT_VELOCITY_BUFFER | EFFECT_DEPTH_DOUBLE_BUFFER | EFFECT_DOUBLE_BUFFER | EFFECT_POST_BUFFER;
effects->taa_reproject_sample = ((effects->taa_reproject_sample + 1) % 16);
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index f9646deca8e..97d370795bc 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -61,7 +61,8 @@ static void get_material_solid_color(WORKBENCH_PrivateData *wpd, Object *ob, flo
unsigned int obhash = BLI_ghashutil_strhash(ob->id.name);
cpack_to_rgb(obhash, &color[0], &color[1], &color[2]);
- } else {
+ }
+ else {
copy_v3_v3(color, ob->col);
}
}
@@ -142,7 +143,7 @@ void workbench_materials_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob
DRW_shgroup_call_add(stl->g_data->depth_shgrp, geom, ob->obmat);
/* Solid */
- GPUShader *shader = wpd->drawtype_lighting == V3D_LIGHTING_FLAT?e_data.solid_flat_sh:e_data.solid_studio_sh;
+ GPUShader *shader = wpd->drawtype_lighting == V3D_LIGHTING_FLAT ? e_data.solid_flat_sh : e_data.solid_studio_sh;
float color[3];
get_material_solid_color(wpd, ob, color);
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index dcc005d190a..d42bb09684c 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -984,7 +984,8 @@ static void drw_engines_enable_from_mode(int mode)
}
}
-static void drw_engines_enable_from_overlays(int draw_overlays) {
+static void drw_engines_enable_from_overlays(int draw_overlays)
+{
if (draw_overlays) {
use_drw_engine(&draw_engine_overlay_type);
}
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index ff29d7d7f3d..159a19a94c2 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -565,13 +565,13 @@ static void draw_clipping_setup_from_view(void)
/* distance to view Z axis */
f = len_v2(farpoint);
/* get corresponding point on the near plane */
- mul_v2_v2fl(farxy, farpoint, s/e);
+ mul_v2_v2fl(farxy, farpoint, s / e);
/* this formula preserve the sign of n */
sub_v2_v2(nearpoint, farxy);
n = f * s / e - len_v2(nearpoint);
c = len_v2(farcenter) / e;
/* the big formula, it simplifies to (F-N)/(2(e-s)) for the symmetric case */
- z = (F-N) / (2.0f * (e-s + c*(f-n)));
+ z = (F - N) / (2.0f * (e - s + c * (f - n)));
bsphere->center[0] = farcenter[0] * z / e;
bsphere->center[1] = farcenter[1] * z / e;
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 59e34ee7ba9..6ad1205a296 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -110,8 +110,7 @@ static void overlay_cache_init(void *vedata)
}
/* Face Orientation Pass */
- if (stl->g_data->overlays & V3D_OVERLAY_FACE_ORIENTATION)
- {
+ if (stl->g_data->overlays & V3D_OVERLAY_FACE_ORIENTATION) {
int state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | bm_face_orientation;
psl->face_orientation_pass = DRW_pass_create("Face Orientation", state);
stl->g_data->face_orientation_shgrp = DRW_shgroup_create(e_data.face_orientation_sh, psl->face_orientation_pass);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 371f42e17b3..88a4e1d148a 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -1482,8 +1482,7 @@ static int edbm_face_make_planar_exec(bContext *C, wmOperator *op)
const int repeat = RNA_int_get(op->ptr, "repeat");
const float fac = RNA_float_get(op->ptr, "factor");
- for (uint ob_index = 0; ob_index < objects_len; ob_index++)
- {
+ for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
Object *obedit = objects[ob_index];
BMEditMesh *em = BKE_editmesh_from_object(obedit);
if (em->bm->totfacesel == 0) {
@@ -1491,8 +1490,8 @@ static int edbm_face_make_planar_exec(bContext *C, wmOperator *op)
}
if (!EDBM_op_callf(
- em, op, "planar_faces faces=%hf iterations=%i factor=%f",
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list