NLA SoC: Merge from 2.5
[blender.git] / source / blender / blenkernel / intern / object.c
index 7a83162f7a747f0db238dc2d1d7d7c0fef8a5b49..c2916bc2231c70e698a005d35d2ff66c2e11543f 100644 (file)
@@ -977,6 +977,8 @@ Object *add_only_object(int type, char *name)
        ob->anisotropicFriction[2] = 1.0f;
        ob->gameflag= OB_PROP|OB_COLLISION;
        ob->margin = 0.0;
+       /* ob->pad3 == Contact Processing Threshold */
+       ob->m_contactProcessingThreshold = 1.;
        
        /* NT fluid sim defaults */
        ob->fluidsimFlag = 0;
@@ -1131,6 +1133,9 @@ static void copy_object_pose(Object *obn, Object *ob)
                         * is changed to object->proxy_from when evaluating the driver. */
                        if(con->ipo && !con->ipo->id.lib) {
                                IpoCurve *icu;
+                               
+                               con->ipo= copy_ipo(con->ipo);
+                               
                                for(icu= con->ipo->curve.first; icu; icu= icu->next) {
                                        if(icu->driver && icu->driver->ob==ob)
                                                icu->driver->ob= obn;