diff options
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index c0c19b2604e..d0e34ab371c 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1900,13 +1900,6 @@ static void ob_parvert3(Object *ob, Object *par, float mat[][4]) } } -// XXX what the hell is this? -static int no_parent_ipo=0; -void set_no_parent_ipo(int val) -{ - no_parent_ipo= val; -} - static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[4][4]) { float *fp1, *fp2; @@ -1914,7 +1907,7 @@ static int where_is_object_parslow(Object *ob, float obmat[4][4], float slowmat[ int a; // include framerate - fac1= ( 1.0f / (1.0f + (float)fabs(ob->sf)) ); + fac1= ( 1.0f / (1.0f + fabsf(ob->sf)) ); if(fac1 >= 1.0f) return 0; fac2= 1.0f-fac1; @@ -1946,7 +1939,7 @@ void where_is_object_time(Scene *scene, Object *ob, float ctime) /* hurms, code below conflicts with depgraph... (ton) */ /* and even worse, it gives bad effects for NLA stride too (try ctime != par->ctime, with MBlur) */ - if(no_parent_ipo==0 && stime != par->ctime) { + if(stime != par->ctime) { // only for ipo systems? Object tmp= *par; |