[Bf-blender-cvs] [12fa08d] soc-2014-bge: Merge branch 'master' into soc-2014-bge

[Ines Almeida]

Commit: 12fa08d83f7699928488a52d291a1ff3769abb75
Author: Ines Almeida
Date:   Mon Nov 3 13:18:39 2014 +0100
Branches: soc-2014-bge
https://developer.blender.org/rB12fa08d83f7699928488a52d291a1ff3769abb75

Merge branch 'master' into soc-2014-bge

Conflicts:
	source/blender/blenkernel/intern/object.c

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/object.c
index 2de9398,72f7d54..6b51ac3
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -2287,10 -2387,20 +2387,19 @@@ static void solve_parenting(Scene *scen
  
  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;
 -	fac2 = 1.0f - fac1;
  
 -	fp1 = obmat[0];
 -	fp2 = slowmat[0];
 -	for (a = 0; a < 16; a++, fp1++, fp2++) {
 -		fp1[0] = fac1 * fp1[0] + fac2 * fp2[0];
 -	}
 +	blend_m4_m4m4(obmat, slowmat, obmat, fac1);
  
  	return 1;
  }