[Bf-blender-cvs] [293f4d88dac] master: Cleanup: style, unused variable
Campbell Barton
noreply at git.blender.org
Thu Jan 31 05:51:39 CET 2019
Commit: 293f4d88dac4919371e3e9c375f7c4cde803b078
Author: Campbell Barton
Date: Thu Jan 31 15:54:37 2019 +1100
Branches: master
https://developer.blender.org/rB293f4d88dac4919371e3e9c375f7c4cde803b078
Cleanup: style, unused variable
===================================================================
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/workbench/workbench_effect_dof.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpu/intern/gpu_shader.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 159520d6d67..bda6e75ea0c 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -3608,7 +3608,7 @@ static VMesh *adj_vmesh(BevelParams *bp, BevVert *bv)
0.647f, /* 9 */
0.639f, /* 10 */
0.647f, /* 11 */
- };
+ };
n = bv->vmesh->count;
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 6ffe44e096e..d3582bd9de5 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -359,7 +359,7 @@ bool DRW_gpencil_onion_active(bGPdata *gpd)
DRWShadingGroup *DRW_gpencil_shgroup_stroke_create(
GPENCIL_e_data *e_data, GPENCIL_Data *vedata, DRWPass *pass, GPUShader *shader, Object *ob,
bGPdata *gpd, bGPDstroke *gps, MaterialGPencilStyle *gp_style, int id,
- bool onion, const float scale)
+ bool onion, const float scale)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
const float *viewport_size = DRW_viewport_size_get();
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index 85bb5ba0522..9f7db4d14a9 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -137,7 +137,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata, Object *camera)
WORKBENCH_FramebufferList *fbl = vedata->fbl;
if ((wpd->shading.flag & V3D_SHADING_DEPTH_OF_FIELD) == 0 ||
- (camera == NULL))
+ (camera == NULL))
{
wpd->dof_enabled = false;
return;
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index b5d88b846de..dff78d15692 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -649,7 +649,6 @@ bool ED_object_editmode_enter(bContext *C, int flag)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- ViewLayer *view_layer = CTX_data_view_layer(C);
Object *ob;
/* Active layer checked here for view3d,
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index cc3b8398610..d7ecfadcfc5 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2151,7 +2151,7 @@ static void bmesh_topology_rake(
for (iteration = 0; iteration <= count; ++iteration) {
SculptThreadedTaskData data = {
- .sd = sd,.ob = ob,.brush = brush,.nodes = nodes,
+ .sd = sd, .ob = ob, .brush = brush, .nodes = nodes,
.strength = factor,
};
ParallelRangeSettings settings;
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index 35a07e41844..66bbc24eca4 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -653,7 +653,7 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
ptr = &path->ptr[path->len - 1];
if (ptr->type) {
- if(RNA_struct_is_a(ptr->type, &RNA_Light))
+ if (RNA_struct_is_a(ptr->type, &RNA_Light))
sbuts->dataicon = ICON_OUTLINER_DATA_LIGHT;
else
sbuts->dataicon = RNA_struct_ui_icon(ptr->type);
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a5154fd1e8a..d3661cf60e1 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -3349,7 +3349,7 @@ void flushTransUVs(TransInfo *t)
td->loc2d[0] *= size[0];
td->loc2d[1] *= size[1];
- switch(sima->pixel_snap_mode) {
+ switch (sima->pixel_snap_mode) {
case SI_PIXEL_SNAP_CENTER:
td->loc2d[0] = roundf(td->loc2d[0] - 0.5f) + 0.5f;
td->loc2d[1] = roundf(td->loc2d[1] - 0.5f) + 0.5f;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index ed5feed1455..655a973265e 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -115,10 +115,10 @@ static void deformStroke(
}
if (!is_stroke_affected_by_modifier(
- ob,
- mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
- mmd->flag & GP_NOISE_INVERT_LAYER, mmd->flag & GP_NOISE_INVERT_PASS,
- mmd->flag & GP_NOISE_INVERT_LAYERPASS))
+ ob,
+ mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
+ mmd->flag & GP_NOISE_INVERT_LAYER, mmd->flag & GP_NOISE_INVERT_PASS,
+ mmd->flag & GP_NOISE_INVERT_LAYERPASS))
{
return;
}
@@ -182,7 +182,7 @@ static void deformStroke(
sc_diff = abs(mmd->scene_frame - sc_frame);
/* only recalc if the gp frame change or the number of scene frames is bigger than step */
if ((!gpl->actframe) || (mmd->gp_frame != gpl->actframe->framenum) ||
- (sc_diff >= mmd->step))
+ (sc_diff >= mmd->step))
{
vran = mmd->vrand1 = BLI_rng_get_float(mmd->rng);
vdir = mmd->vrand2 = BLI_rng_get_float(mmd->rng);
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 24ee8330466..65ada213d06 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -893,7 +893,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_NUM_BUILTIN_SHADERS] = {
},
[GPU_SHADER_3D_GROUNDPOINT] = {
- .vert= datatoc_gpu_shader_3D_groundpoint_vert_glsl,
+ .vert = datatoc_gpu_shader_3D_groundpoint_vert_glsl,
.frag = datatoc_gpu_shader_point_uniform_color_frag_glsl,
},
[GPU_SHADER_3D_GROUNDLINE] = {
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index d72c20bb057..4313f12036d 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2178,7 +2178,7 @@ static void rna_def_space_image_uv(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL}
};
- static const EnumPropertyItem pixel_snap_mode_items[] = {
+ static const EnumPropertyItem pixel_snap_mode_items[] = {
{SI_PIXEL_SNAP_DISABLED, "DISABLED", 0, "Disabled", "Don't snap to pixels"},
{SI_PIXEL_SNAP_CORNER, "CORNER", 0, "Corner", "Snap to pixel corners"},
{SI_PIXEL_SNAP_CENTER, "CENTER", 0, "Center", "Snap to pixel centers"},
More information about the Bf-blender-cvs
mailing list