diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-01-09 16:15:13 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-01-15 05:45:46 +0400 |
| commit | fcec99d9cc491755c7b63d46056c973701aca509 (patch) | |
| tree | ab18323d295fe304c6c90142a223b5d0c86e5f6b /source | |
| parent | 5196c4fd1281663e5d11f64c594489d0356b6696 (diff) | |
Whitespace/Style fix
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f022b9e135f..32de1f4a9a5 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -683,7 +683,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object switch (partype) { case PAR_CURVE: /* curve deform */ - if ( modifiers_isDeformedByCurve(ob) != par) { + if (modifiers_isDeformedByCurve(ob) != par) { md = ED_object_modifier_add(reports, bmain, scene, ob, NULL, eModifierType_Curve); if (md) { ((CurveModifierData *)md)->object = par; @@ -747,7 +747,7 @@ int ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object copy_v3_v3(ob->loc, vec); } - else if (pararm && ob->type == OB_MESH && par->type == OB_ARMATURE) { + else if (pararm && (ob->type == OB_MESH) && (par->type == OB_ARMATURE)) { if (partype == PAR_ARMATURE_NAME) create_vgroups_from_armature(reports, scene, ob, par, ARM_GROUPS_NAME, FALSE); else if (partype == PAR_ARMATURE_ENVELOPE) |