Commit: 60b24f2415233d6dd6feb0c463de59570d7835ff
Author: Campbell Barton
Date: Tue Aug 28 11:01:29 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB60b24f2415233d6dd6feb0c463de59570d7835ff
Cleanup: indentation
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/python/bmesh/bmesh_py_ops.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index 8a57d0c6740..5c2e5e89d0b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -149,8 +149,8 @@ float get_modifier_point_weight(MDeformVert *dvert, bool
inverse, int def_nr)
/* set material when apply modifiers (used in tint and color modifier) */
void gpencil_apply_modifier_material(
- Main *bmain, Object *ob, Material *mat,
- GHash *gh_color, bGPDstroke *gps, bool crt_material)
+ Main *bmain, Object *ob, Material *mat,
+ GHash *gh_color, bGPDstroke *gps, bool crt_material)
{
MaterialGPencilStyle *gp_style = mat->gp_style;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
index f2866be1391..95772d141f1 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
@@ -48,7 +48,7 @@ bool is_stroke_affected_by_modifier(
float get_modifier_point_weight(struct MDeformVert *dvert, bool inverse, int
def_nr);
void gpencil_apply_modifier_material(
- struct Main *bmain, struct Object *ob, struct Material *mat,
- struct GHash *gh_color, struct bGPDstroke *gps, bool crt_material);
+ struct Main *bmain, struct Object *ob, struct Material *mat,
+ struct GHash *gh_color, struct bGPDstroke *gps, bool crt_material);
#endif /* __MOD_GPENCIL_UTIL_H__ */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 5c177077a98..19e3b1bb384 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -147,8 +147,9 @@ static void bakeModifier(
deformStroke(md, depsgraph, ob, gpl, gps);
- gpencil_apply_modifier_material(bmain, ob, mat,
gh_color, gps,
- (bool)(mmd->flag &
GP_OPACITY_CREATE_COLORS));
+ gpencil_apply_modifier_material(
+ bmain, ob, mat, gh_color, gps,
+ (bool)(mmd->flag &
GP_OPACITY_CREATE_COLORS));
}
}
}
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
index 8af9ff6eec8..98cf3ae16e7 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
@@ -135,8 +135,9 @@ static void bakeModifier(
deformStroke(md, depsgraph, ob, gpl, gps);
- gpencil_apply_modifier_material(bmain, ob, mat,
gh_color, gps,
- (bool)(mmd->flag &
GP_TINT_CREATE_COLORS));
+ gpencil_apply_modifier_material(
+ bmain, ob, mat, gh_color, gps,
+ (bool)(mmd->flag &
GP_TINT_CREATE_COLORS));
}
}
}
diff --git a/source/blender/python/bmesh/bmesh_py_ops.c
b/source/blender/python/bmesh/bmesh_py_ops.c
index dedc78d79b4..49e71da3bc3 100644
--- a/source/blender/python/bmesh/bmesh_py_ops.c
+++ b/source/blender/python/bmesh/bmesh_py_ops.c
@@ -111,11 +111,12 @@ static char *bmp_slots_as_args(const BMOSlotType
slot_types[BMO_OP_MAX_SLOTS], c
(slot_types[i].subtype.elem &
BMO_OP_SLOT_SUBTYPE_ELEM_IS_SINGLE) ? "None" : "[]"; break;
case BMO_OP_SLOT_MAPPING: value = "{}"; break;
}
- BLI_dynstr_appendf(dyn_str, i ? ", %.*s=%s%s%s%s%s" :
"%.*s=%s%s%s%s%s",
- name_len, slot_types[i].name,
- set ? "{" : "", quoted ? "'"
: "",
- value,
- quoted ? "'" : "", set ? "}"
: "");
+ BLI_dynstr_appendf(
+ dyn_str, i ? ", %.*s=%s%s%s%s%s" : "%.*s=%s%s%s%s%s",
+ name_len, slot_types[i].name,
+ set ? "{" : "", quoted ? "'" : "",
+ value,
+ quoted ? "'" : "", set ? "}" : "");
i++;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
