[Bf-blender-cvs] [fcec99d] master: Whitespace/Style fix
Joshua Leung
noreply at git.blender.org
Wed Jan 15 03:18:57 CET 2014
Commit: fcec99d9cc491755c7b63d46056c973701aca509
Author: Joshua Leung
Date: Fri Jan 10 01:15:13 2014 +1300
https://developer.blender.org/rBfcec99d9cc491755c7b63d46056c973701aca509
Whitespace/Style fix
===================================================================
M source/blender/editors/object/object_relations.c
===================================================================
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index f022b9e..32de1f4 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)
More information about the Bf-blender-cvs
mailing list