[Bf-blender-cvs] [6abb37babc6] blender2.8: Cleanup: style
Campbell Barton
noreply at git.blender.org
Sun Sep 2 08:42:46 CEST 2018
Commit: 6abb37babc6aad9d7f262b1516b7a0e2972cb8e1
Author: Campbell Barton
Date: Sun Sep 2 16:45:00 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB6abb37babc6aad9d7f262b1516b7a0e2972cb8e1
Cleanup: style
===================================================================
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/editors/armature/armature_skinning.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_gpencil.h
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/space_view3d/view3d_snap.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index 2ca6a35eec5..2e093ba11a2 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -62,20 +62,24 @@ void end_latt_deform(struct LatticeDeformData *lattice_deform_data);
bool object_deform_mball(struct Object *ob, struct ListBase *dispbase);
void outside_lattice(struct Lattice *lt);
-void curve_deform_verts(struct Object *cuOb, struct Object *target,
+void curve_deform_verts(
+ struct Object *cuOb, struct Object *target,
struct Mesh *mesh, float (*vertexCos)[3],
int numVerts, const char *vgroup, short defaxis);
-void curve_deform_vector(struct Object *cuOb, struct Object *target,
- float orco[3], float vec[3], float mat[3][3], int no_rot_axis);
-
-void lattice_deform_verts(struct Object *laOb, struct Object *target,
- struct Mesh *mesh, float (*vertexCos)[3],
- int numVerts, const char *vgroup, float influence);
-void armature_deform_verts(struct Object *armOb, struct Object *target,
- const struct Mesh *mesh, float (*vertexCos)[3],
- float (*defMats)[3][3], int numVerts, int deformflag,
- float (*prevCos)[3], const char *defgrp_name,
- struct bGPDstroke *gps);
+void curve_deform_vector(
+ struct Object *cuOb, struct Object *target,
+ float orco[3], float vec[3], float mat[3][3], int no_rot_axis);
+
+void lattice_deform_verts(
+ struct Object *laOb, struct Object *target,
+ struct Mesh *mesh, float (*vertexCos)[3],
+ int numVerts, const char *vgroup, float influence);
+void armature_deform_verts(
+ struct Object *armOb, struct Object *target,
+ const struct Mesh *mesh, float (*vertexCos)[3],
+ float (*defMats)[3][3], int numVerts, int deformflag,
+ float (*prevCos)[3], const char *defgrp_name,
+ struct bGPDstroke *gps);
float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3];
void BKE_lattice_vertexcos_apply(struct Object *ob, float (*vertexCos)[3]);
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index af82d8fa200..bff71f64871 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -423,10 +423,10 @@ void BKE_gpencil_stroke_modifiers(Depsgraph *depsgraph, Object *ob, bGPDlayer *g
/* some modifiers could require a recalc of fill triangulation data */
if (gpd->flag & GP_DATA_STROKE_FORCE_RECALC) {
if (ELEM(md->type,
- eGpencilModifierType_Armature,
- eGpencilModifierType_Hook,
- eGpencilModifierType_Lattice,
- eGpencilModifierType_Offset))
+ eGpencilModifierType_Armature,
+ eGpencilModifierType_Hook,
+ eGpencilModifierType_Lattice,
+ eGpencilModifierType_Offset))
{
gps->flag |= GP_STROKE_RECALC_CACHES;
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 29544a601d5..f1d3ad37e67 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -866,7 +866,7 @@ static void gpencil_draw_strokes(
if ((fillgrp) && (!stl->storage->simplify_fill)) {
gpencil_add_fill_shgroup(
cache, fillgrp, ob, derived_gpf, gps,
- opacity, tintcolor, false, custonion);
+ opacity, tintcolor, false, custonion);
}
/* stroke */
if (strokegrp) {
@@ -1245,7 +1245,7 @@ void DRW_gpencil_populate_datablock(
/* if pose mode, maybe the overlay to fade geometry is enabled */
if ((draw_ctx->obact) && (draw_ctx->object_mode == OB_MODE_POSE) &&
- (v3d->overlay.flag & V3D_OVERLAY_BONE_SELECT))
+ (v3d->overlay.flag & V3D_OVERLAY_BONE_SELECT))
{
opacity = gpl->opacity * v3d->overlay.bone_select_alpha;
}
diff --git a/source/blender/editors/armature/armature_skinning.c b/source/blender/editors/armature/armature_skinning.c
index 63068e61ba3..834be3b69ef 100644
--- a/source/blender/editors/armature/armature_skinning.c
+++ b/source/blender/editors/armature/armature_skinning.c
@@ -104,7 +104,7 @@ static int bone_skinnable_cb(Object *UNUSED(ob), Bone *bone, void *datap)
for (a = 0; a < segments; a++) {
**hbone = bone;
- ++*hbone;
+ (*hbone)++;
}
}
return segments;
@@ -180,7 +180,7 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap)
for (a = 0; a < segments; a++) {
**hgroup = defgroup;
- ++*hgroup;
+ (*hgroup)++;
}
}
return segments;
diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c
index b55239deadc..3626528414a 100644
--- a/source/blender/editors/gpencil/gpencil_armature.c
+++ b/source/blender/editors/gpencil/gpencil_armature.c
@@ -144,7 +144,7 @@ static int gpencil_bone_skinnable_cb(Object *UNUSED(ob), Bone *bone, void *datap
if (!(bone->flag & BONE_HIDDEN_P)) {
if (!(bone->flag & BONE_NO_DEFORM)) {
if (data->heat && data->armob->pose &&
- BKE_pose_channel_find_name(data->armob->pose, bone->name))
+ BKE_pose_channel_find_name(data->armob->pose, bone->name))
{
segments = bone->segments;
}
@@ -157,7 +157,7 @@ static int gpencil_bone_skinnable_cb(Object *UNUSED(ob), Bone *bone, void *datap
for (a = 0; a < segments; a++) {
**hbone = bone;
- ++*hbone;
+ (*hbone)++;
}
}
return segments;
@@ -214,7 +214,7 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap)
if (!(bone->flag & BONE_HIDDEN_P)) {
if (!(bone->flag & BONE_NO_DEFORM)) {
if (data->heat && data->armob->pose &&
- BKE_pose_channel_find_name(data->armob->pose, bone->name))
+ BKE_pose_channel_find_name(data->armob->pose, bone->name))
{
segments = bone->segments;
}
@@ -237,7 +237,7 @@ static int dgroup_skinnable_cb(Object *ob, Bone *bone, void *datap)
for (a = 0; a < segments; a++) {
**hgroup = defgroup;
- ++*hgroup;
+ (*hgroup)++;
}
}
return segments;
@@ -319,7 +319,7 @@ static void gpencil_add_verts_to_dgroups(
bbone = NULL;
if ((ob_arm->pose) &&
- (pchan = BKE_pose_channel_find_name(ob_arm->pose, bone->name)))
+ (pchan = BKE_pose_channel_find_name(ob_arm->pose, bone->name)))
{
if (bone->segments > 1) {
segments = bone->segments;
@@ -366,7 +366,7 @@ static void gpencil_add_verts_to_dgroups(
for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) {
if ((gpf == gpl->actframe) ||
- ((gpf->flag & GP_FRAME_SELECT) && (is_multiedit)))
+ ((gpf->flag & GP_FRAME_SELECT) && (is_multiedit)))
{
if (gpf == NULL)
@@ -463,8 +463,9 @@ static void gpencil_object_vgroup_calc_from_armature(
/* Traverse the bone list, trying to create empty vertex
* groups corresponding to the bone.
*/
- defbase_add = gpencil_bone_looper(ob, arm->bonebase.first, NULL,
- vgroup_add_unique_bone_cb);
+ defbase_add = gpencil_bone_looper(
+ ob, arm->bonebase.first, NULL,
+ vgroup_add_unique_bone_cb);
if (defbase_add) {
/* its possible there are DWeight's outside the range of the current
@@ -493,11 +494,12 @@ bool ED_gpencil_add_armature_weights(
/* if no armature modifier, add a new one */
GpencilModifierData *md = BKE_gpencil_modifiers_findByType(ob, eGpencilModifierType_Armature);
if (md == NULL) {
- md = ED_object_gpencil_modifier_add(reports, bmain, scene,
- ob, "Armature", eGpencilModifierType_Armature);
+ md = ED_object_gpencil_modifier_add(
+ reports, bmain, scene,
+ ob, "Armature", eGpencilModifierType_Armature);
if (md == NULL) {
BKE_report(reports, RPT_ERROR,
- "Unable to add a new Armature modifier to object");
+ "Unable to add a new Armature modifier to object");
return false;
}
DEG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
@@ -511,7 +513,7 @@ bool ED_gpencil_add_armature_weights(
else {
if (ob_arm != mmd->object) {
BKE_report(reports, RPT_ERROR,
- "The existing Armature modifier is already using a different Armature object");
+ "The existing Armature modifier is already using a different Armature object");
return false;
}
}
@@ -586,7 +588,7 @@ static int gpencil_generate_weights_exec(bContext *C, wmOperator *op)
if (ob_arm == NULL) {
BKE_report(op->reports, RPT_ERROR,
- "No Armature object in the view layer");
+ "No Armature object in the view layer");
return OPERATOR_CANCELLED;
}
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index 2ff7e45d7a2..6aeaa04f2bd 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -248,7 +248,7 @@ static void gp_draw_datablock(tGPDfill *tgpf, float ink[4])
/* normal strokes */
if ((tgpf->fill_draw_mode == GP_FILL_DMODE_STROKE) ||
- (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH))
+ (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH))
{
ED_gp_draw_fill(&tgpw);
@@ -256,7 +256,7 @@ static void gp_draw_datablock(tGPDfill *tgpf, float ink[4])
/* 3D Lines with basic shapes and invisible lines */
if ((tgpf->fill_draw_mode == GP_FILL_DMODE_CONTROL) ||
- (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH))
+ (tgpf->fill_draw_mode == GP_FILL_DMODE_BOTH))
{
gp_draw_basic_stroke(tgpf, gps, tgpw.diff_mat, gps->flag & GP_STROKE_CYCLIC, ink,
tgpf->flag, tgpf->fill_threshold);
@@ -676,7 +676,7 @@ static void gpencil_get_outline_points(tGPDfill *tgpf)
int cur_back_offset = -1;
for (int i = 0; i < NEIGHBOR_COUNT; i++) {
if (backtracked_offset[0][0] == offset[i][0] &&
- backtracked_offset[0][1] == offset[i][1])
+ backtracked_offset[0][1] == offset[i][1])
{
/* Finding the bracktracked pixel offset index */
cur_back_offset = i;
@@ -710,7 +710,7 @
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list