blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 755 Projects 19 Wiki Activity

Whitespace/Style fix

This commit is contained in:
Joshua Leung 2014-01-10 01:15:13 +13:00
parent 5196c4fd12
commit fcec99d9cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/object/object_relations.c
View File

@ -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)