[Bf-blender-cvs] [1fb9fcb333a] blender2.8: Cleanup: indentation
Campbell Barton
noreply at git.blender.org
Wed Oct 31 04:48:11 CET 2018
Commit: 1fb9fcb333a03a3151b352e9cb8e3cd0cd10b2b4
Author: Campbell Barton
Date: Wed Oct 31 14:43:25 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB1fb9fcb333a03a3151b352e9cb8e3cd0cd10b2b4
Cleanup: indentation
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_gpencil.h
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index e0e69e0de91..54a2cf4b960 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1311,9 +1311,9 @@ void DRW_gpencil_populate_datablock(
}
/* fade no active layers */
if ((overlay) && (draw_ctx->object_mode == OB_MODE_GPENCIL_PAINT) &&
- (v3d->gp_flag & V3D_GP_FADE_NOACTIVE_LAYERS) &&
- (draw_ctx->obact) && (draw_ctx->obact == ob) &&
- (gpl != gpl_active))
+ (v3d->gp_flag & V3D_GP_FADE_NOACTIVE_LAYERS) &&
+ (draw_ctx->obact) && (draw_ctx->obact == ob) &&
+ (gpl != gpl_active))
{
opacity = opacity * v3d->overlay.gpencil_fade_layer;
}
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index d8de253c8eb..09d9a068b7d 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -368,7 +368,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
if (DRW_state_is_image_render()) {
/* TODO: Should be based on the number of samples used for render. */
- noise_offset = fmodf(noise_offset + 1.0f/8.0f, 1.0f);
+ noise_offset = fmodf(noise_offset + 1.0f / 8.0f, 1.0f);
}
if (wpd->shading.flag & XRAY_FLAG(wpd)) {
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 008160e2459..3eb73b9eef2 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -181,7 +181,7 @@ static eKeyframeExtremeDrawOpts bezt_extreme_type(BezTripleChain *chain)
/* Comparator callback used for ActKeyColumns and BezTripleChain */
static short compare_ak_bezt(void *node, void *data)
{
- BezTripleChain *chain = (BezTripleChain*)data;
+ BezTripleChain *chain = data;
return compare_ak_cfraPtr(node, &chain->cur->vec[1][0]);
}
@@ -190,7 +190,7 @@ static short compare_ak_bezt(void *node, void *data)
static DLRBT_Node *nalloc_ak_bezt(void *data)
{
ActKeyColumn *ak = MEM_callocN(sizeof(ActKeyColumn), "ActKeyColumn");
- BezTripleChain *chain = (BezTripleChain*)data;
+ BezTripleChain *chain = data;
BezTriple *bezt = chain->cur;
/* store settings based on state of BezTriple */
@@ -209,8 +209,8 @@ static DLRBT_Node *nalloc_ak_bezt(void *data)
/* Node updater callback used for building ActKeyColumns from BezTripleChain */
static void nupdate_ak_bezt(void *node, void *data)
{
- ActKeyColumn *ak = (ActKeyColumn *)node;
- BezTripleChain *chain = (BezTripleChain*)data;
+ ActKeyColumn *ak = node;
+ BezTripleChain *chain = data;
BezTriple *bezt = chain->cur;
/* set selection status and 'touched' status */
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 89d1575c650..dac61aefb4b 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -5213,7 +5213,7 @@ static int curve_extrude_exec(bContext *C, wmOperator *UNUSED(op))
Nurb *nu;
for (nu = editnurb->nurbs.first; nu; nu = nu->next) {
if ((nu->pntsv == 1) &&
- (ED_curve_nurb_select_count(v3d, nu) == 1))
+ (ED_curve_nurb_select_count(v3d, nu) == 1))
{
as_curve = true;
break;
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c
index 5b1b8d8a884..e160c7e05a1 100644
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@ -1674,8 +1674,8 @@ static void gp_draw_data(RegionView3D *rv3d,
/* if we have strokes for scenes (3d view)/clips (movie clip editor)
* and objects/tracks, multiple data blocks have to be drawn */
static void gp_draw_data_all(
- ViewLayer *view_layer, RegionView3D *rv3d, Scene *scene, bGPdata *gpd,
- int offsx, int offsy, int winx, int winy,
+ ViewLayer *view_layer, RegionView3D *rv3d, Scene *scene, bGPdata *gpd,
+ int offsx, int offsy, int winx, int winy,
int cfra, int dflag, const char UNUSED(spacetype))
{
bGPdata *gpd_source = NULL;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index a812b7377c3..837b18d1e52 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1877,7 +1877,7 @@ static bool gp_session_initdata(bContext *C, wmOperator *op, tGPsdata *p)
/* lock axis (in some modes, disable) */
if (((*p->align_flag & GP_PROJECT_DEPTH_VIEW) == 0) &&
- ((*p->align_flag & GP_PROJECT_DEPTH_STROKE) == 0))
+ ((*p->align_flag & GP_PROJECT_DEPTH_STROKE) == 0))
{
p->lock_axis = ts->gp_sculpt.lock_axis;
}
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 0b69ebeb758..5d93c2e3065 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -163,7 +163,7 @@ void ED_gpencil_draw_view3d_object(
bool only3d);
void ED_gpencil_draw_ex(
struct ViewLayer *view_layer, struct RegionView3D *rv3d, struct Scene *scene,
- struct bGPdata *gpd, int winx, int winy,
+ struct bGPdata *gpd, int winx, int winy,
const int cfra, const char spacetype);
/* ----------- Grease-Pencil AnimEdit API ------------------ */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
index 86892ad44fd..43af4b94c15 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
@@ -77,10 +77,11 @@ static void deformStroke(
float mat[4][4];
float loc[3], rot[3], scale[3];
- if (!is_stroke_affected_by_modifier(ob,
- mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
- mmd->flag & GP_OFFSET_INVERT_LAYER, mmd->flag & GP_OFFSET_INVERT_PASS,
- mmd->flag & GP_OFFSET_INVERT_LAYERPASS))
+ if (!is_stroke_affected_by_modifier(
+ ob,
+ mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
+ mmd->flag & GP_OFFSET_INVERT_LAYER, mmd->flag & GP_OFFSET_INVERT_PASS,
+ mmd->flag & GP_OFFSET_INVERT_LAYERPASS))
{
return;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 9c38198a240..b89c3792455 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -81,7 +81,7 @@ static void deformStroke(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_OPACITY_INVERT_LAYER, mmd->flag & GP_OPACITY_INVERT_PASS,
- mmd->flag & GP_OPACITY_INVERT_LAYERPASS))
+ mmd->flag & GP_OPACITY_INVERT_LAYERPASS))
{
return;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
index 0dde238d205..2d0b90e6de7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
@@ -66,10 +66,11 @@ static void deformStroke(
{
SimplifyGpencilModifierData *mmd = (SimplifyGpencilModifierData *)md;
- if (!is_stroke_affected_by_modifier(ob,
- mmd->layername, mmd->pass_index, mmd->layer_pass, 4, gpl, gps,
- mmd->flag & GP_SIMPLIFY_INVERT_LAYER, mmd->flag & GP_SIMPLIFY_INVERT_PASS,
- mmd->flag & GP_SIMPLIFY_INVERT_LAYERPASS))
+ if (!is_stroke_affected_by_modifier(
+ ob,
+ mmd->layername, mmd->pass_index, mmd->layer_pass, 4, gpl, gps,
+ mmd->flag & GP_SIMPLIFY_INVERT_LAYER, mmd->flag & GP_SIMPLIFY_INVERT_PASS,
+ mmd->flag & GP_SIMPLIFY_INVERT_LAYERPASS))
{
return;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
index 0e2750ec58d..8d93980a9d0 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
@@ -69,10 +69,11 @@ static void deformStroke(
SmoothGpencilModifierData *mmd = (SmoothGpencilModifierData *)md;
const int def_nr = defgroup_name_index(ob, mmd->vgname);
- if (!is_stroke_affected_by_modifier(ob,
- mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
- mmd->flag & GP_SMOOTH_INVERT_LAYER, mmd->flag & GP_SMOOTH_INVERT_PASS,
- mmd->flag & GP_SMOOTH_INVERT_LAYERPASS))
+ if (!is_stroke_affected_by_modifier(
+ ob,
+ mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
+ mmd->flag & GP_SMOOTH_INVERT_LAYER, mmd->flag & GP_SMOOTH_INVERT_PASS,
+ mmd->flag & GP_SMOOTH_INVERT_LAYERPASS))
{
return;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index 0c6adcb128b..38aa4159632 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@ -74,7 +74,7 @@ static void deformStroke(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 3, gpl, gps,
mmd->flag & GP_SUBDIV_INVERT_LAYER, mmd->flag & GP_SUBDIV_INVERT_PASS,
- mmd->flag & GP_SUBDIV_INVERT_LAYERPASS))
+ mmd->flag & GP_SUBDIV_INVERT_LAYERPASS))
{
return;
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
index 2dc4e84cef8..4c44559f36e 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
@@ -94,10 +94,11 @@ static void deformStroke(
ThickGpencilModifierData *mmd = (ThickGpencilModifierData *)md;
const int def_nr = defgroup_name_index(ob, mmd->vgname);
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list