blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 781 Projects 19 Wiki Activity

Cleanup: indentation

This commit is contained in:
Campbell Barton 2018-10-31 14:43:25 +11:00
parent 8d496c2f85
commit 1fb9fcb333
17 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@ -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;
}

2
source/blender/draw/engines/workbench/workbench_forward.c
View File

@ -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)) {

8
source/blender/editors/animation/keyframes_draw.c
View File

@ -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 */

2
source/blender/editors/curve/editcurve.c
View File

@ -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;

4
source/blender/editors/gpencil/drawgpencil.c
View File

@ -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;

2
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -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;
}

2
source/blender/editors/include/ED_gpencil.h
View File

@ -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 ------------------ */

9
source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
View File

@ -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;
}

2
source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
View File

@ -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;
}

9
source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
View File

@ -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;
}

9
source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
View File

@ -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;
}

2
source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
View File

@ -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;
}

9
source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
View File

@ -94,10 +94,11 @@ static void deformStroke(
ThickGpencilModifierData *mmd = (ThickGpencilModifierData *)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, 1, gpl, gps,
mmd->flag & GP_THICK_INVERT_LAYER, mmd->flag & GP_THICK_INVERT_PASS,
mmd->flag & GP_THICK_INVERT_LAYERPASS))
if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_THICK_INVERT_LAYER, mmd->flag & GP_THICK_INVERT_PASS,
mmd->flag & GP_THICK_INVERT_LAYERPASS))
{
return;
}

9
source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
View File

@ -75,10 +75,11 @@ static void deformStroke(
{
TintGpencilModifierData *mmd = (TintGpencilModifierData *)md;
if (!is_stroke_affected_by_modifier(ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_TINT_INVERT_LAYER, mmd->flag & GP_TINT_INVERT_PASS,
mmd->flag & GP_TINT_INVERT_LAYERPASS))
if (!is_stroke_affected_by_modifier(
ob,
mmd->layername, mmd->pass_index, mmd->layer_pass, 1, gpl, gps,
mmd->flag & GP_TINT_INVERT_LAYER, mmd->flag & GP_TINT_INVERT_PASS,
mmd->flag & GP_TINT_INVERT_LAYERPASS))
{
return;
}

2
source/blender/makesrna/intern/rna_ID.c
View File

@ -1173,7 +1173,7 @@ static void rna_def_ID(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_fake_user", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_FAKEUSER);
RNA_def_property_ui_text(prop, "Fake User", "Save this data-block even if it has no users");
RNA_def_property_ui_icon(prop, ICON_FAKE_USER_OFF, true);
RNA_def_property_ui_icon(prop, ICON_FAKE_USER_OFF, true);
RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_fake_user_set");
prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE);

4
source/blender/makesrna/intern/rna_action.c
View File

@ -414,7 +414,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_cameras", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOCAM);
RNA_def_property_ui_text(prop, "Display Camera", "Include visualization of camera related animation data");
RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_CAMERA, 0);
RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_CAMERA, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
prop = RNA_def_property(srna, "show_materials", PROP_BOOLEAN, PROP_NONE);
@ -486,7 +486,7 @@ static void rna_def_dopesheet(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_speakers", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOSPK);
RNA_def_property_ui_text(prop, "Display Speaker", "Include visualization of speaker related animation data");
RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_SPEAKER, 0);
RNA_def_property_ui_icon(prop, ICON_OUTLINER_OB_SPEAKER, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
prop = RNA_def_property(srna, "show_gpencil", PROP_BOOLEAN, PROP_NONE);

8
source/blender/makesrna/intern/rna_object.c
View File

@ -111,10 +111,10 @@ const EnumPropertyItem rna_enum_object_empty_drawtype_items[] = {
};
const EnumPropertyItem rna_enum_object_gpencil_type_items[] = {
{ GP_EMPTY, "EMPTY", ICON_GP_EMPTY, "Blank", "Create an empty grease pencil object" },
{ GP_STROKE, "STROKE", ICON_GP_STROKE, "Stroke", "Create a simple stroke with basic colors" },
{ GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "Construct a Suzanne grease pencil object" },
{ 0, NULL, 0, NULL, NULL }
{GP_EMPTY, "EMPTY", ICON_GP_EMPTY, "Blank", "Create an empty grease pencil object"},
{GP_STROKE, "STROKE", ICON_GP_STROKE, "Stroke", "Create a simple stroke with basic colors"},
{GP_MONKEY, "MONKEY", ICON_MONKEY, "Monkey", "Construct a Suzanne grease pencil object"},
{0, NULL, 0, NULL, NULL }
};
static const EnumPropertyItem parent_type_items[] = {