svn merge -r 12347:12382 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / src / editobject.c
index c8f0dec40fa00a5274cc2635915696411a42e58c..628d1c3b405636a0c9f77d1708bc1360695743de 100644 (file)
@@ -1417,7 +1417,7 @@ void make_parent(void)
                                                
                                                add_constraint_to_object(con, base->object);
                                                
-                                               get_constraint_target_matrix(con, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, G.scene->r.cfra - base->object->sf);
+                                               get_constraint_target_matrix(con, 0, CONSTRAINT_OBTYPE_OBJECT, NULL, cmat, G.scene->r.cfra - base->object->sf);
                                                VecSubf(vec, base->object->obmat[3], cmat[3]);
                                                
                                                base->object->loc[0] = vec[0];