more syncing with trunk.

2011-05-11 09:31:00 +00:00
parent b254960873
commit 1e90add66c
31 changed files with 53 additions and 86 deletions
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -57,7 +57,6 @@
 #include "DNA_lattice_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_text_types.h"
-#include "DNA_windowmanager_types.h"


 #include "BKE_action.h"
@@ -2540,9 +2539,9 @@ static void locktrack_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *
 		}
 			break;
 		default:
-			{
-				unit_m3(totmat);
-			}
+		{
+			unit_m3(totmat);
+		}
 			break;
 		}
 		/* Block to keep matrix heading */