Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-02 09:45:00 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-02 09:49:45 +0300
commit6abb37babc6aad9d7f262b1516b7a0e2972cb8e1 (patch)
tree1e2593349ca7903159cd5dab891e8af38b4b1676 /source/blender/editors/gpencil/gpencil_armature.c
parent83199b643047f8576f27f2ffcffe623c0bfc5656 (diff)
Cleanup: style
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_armature.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_armature.c28
1 files changed, 15 insertions, 13 deletions
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;
}