Commit: 8f3c65c9df82ea0a133a929df1db96e731de89b9
Author: Ines Almeida
Date: Mon Nov 3 16:08:11 2014 +0100
Branches: soc-2014-bge
https://developer.blender.org/rB8f3c65c9df82ea0a133a929df1db96e731de89b9
fixing previously bad merge
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 6b51ac3..e0fee2f 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2387,16 +2387,8 @@ static void solve_parenting(Scene *scene, Object *ob,
Object *par, float obmat[4
static bool where_is_object_parslow(Object *ob, float obmat[4][4], float
slowmat[4][4])
{
-<<<<<<< HEAD
float fac1 = (1.0f / (1.0f + fabsf(ob->sf)) );
-=======
- float *fp1, *fp2;
- float fac1, fac2;
- int a;
- /* include framerate */
- fac1 = (1.0f / (1.0f + fabsf(ob->sf)));
->>>>>>> master
if (fac1 >= 1.0f) return 0;
blend_m4_m4m4(obmat, slowmat, obmat, fac1);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
