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:
Diffstat (limited to 'source/blender/blenkernel/intern/object_deform.c')
-rw-r--r--source/blender/blenkernel/intern/object_deform.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index be3dbbb1c71..751110affaf 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -116,8 +116,9 @@ bDeformGroup *BKE_object_defgroup_add_name(Object *ob, const char *name)
{
bDeformGroup *defgroup;
- if (!ob || !OB_TYPE_SUPPORT_VGROUP(ob->type))
+ if (!ob || !OB_TYPE_SUPPORT_VGROUP(ob->type)) {
return NULL;
+ }
defgroup = BKE_defgroup_new(ob, name);
@@ -283,8 +284,9 @@ static void object_defgroup_remove_common(Object *ob, bDeformGroup *dg, const in
BLI_freelinkN(&ob->defbase, dg);
/* Update the active deform index if necessary */
- if (ob->actdef > def_nr)
+ if (ob->actdef > def_nr) {
ob->actdef--;
+ }
/* remove all dverts */
if (BLI_listbase_is_empty(&ob->defbase)) {
@@ -401,10 +403,12 @@ void BKE_object_defgroup_remove(Object *ob, bDeformGroup *defgroup)
BKE_gpencil_vgroup_remove(ob, defgroup);
}
else {
- if (BKE_object_is_in_editmode_vgroup(ob))
+ if (BKE_object_is_in_editmode_vgroup(ob)) {
object_defgroup_remove_edit_mode(ob, defgroup);
- else
+ }
+ else {
object_defgroup_remove_object_mode(ob, defgroup);
+ }
BKE_object_batch_cache_dirty_tag(ob);
}
@@ -424,10 +428,12 @@ void BKE_object_defgroup_remove_all_ex(struct Object *ob, bool only_unlocked)
bDeformGroup *next_dg = dg->next;
if (!only_unlocked || (dg->flag & DG_LOCK_WEIGHT) == 0) {
- if (edit_mode)
+ if (edit_mode) {
object_defgroup_remove_edit_mode(ob, dg);
- else
+ }
+ else {
object_defgroup_remove_object_mode(ob, dg);
+ }
}
dg = next_dg;
@@ -615,8 +621,9 @@ bool *BKE_object_defgroup_validmap_get(Object *ob, const int defbase_tot)
for (md = ob->modifiers.first; md; md = !md->next && step1 ? (step1 = 0),
modifiers_getVirtualModifierList(ob, &virtualModifierData) :
md->next) {
- if (!(md->mode & (eModifierMode_Realtime | eModifierMode_Virtual)))
+ if (!(md->mode & (eModifierMode_Realtime | eModifierMode_Virtual))) {
continue;
+ }
if (md->type == eModifierType_Armature) {
ArmatureModifierData *amd = (ArmatureModifierData *)md;
@@ -627,8 +634,9 @@ bool *BKE_object_defgroup_validmap_get(Object *ob, const int defbase_tot)
for (chan = pose->chanbase.first; chan; chan = chan->next) {
void **val_p;
- if (chan->bone->flag & BONE_NO_DEFORM)
+ if (chan->bone->flag & BONE_NO_DEFORM) {
continue;
+ }
val_p = BLI_ghash_lookup_p(gh, chan->name);
if (val_p) {