Merge branch 'master' into blender2.8

2018-02-07 11:18:50 +11:00
parent 77b61b554c 1e4b612d6a
commit 17577c53c6
58 changed files with 91 additions and 69 deletions
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -49,7 +49,7 @@ subject to the following restrictions:

 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
-#include "DNA_object_force.h"
+#include "DNA_object_force_types.h"

 extern "C" {
 	#include "BLI_utildefines.h"