/vartmpportage-ondiskportagemedia-gfxblender-9999workblender-9999internrigidbodyrb_bullet_api.cpp.rej
Created
September 8, 2020 16:17
-
-
Save brothermechanic/3c8e662318f082e26578679ab6ad07d6 to your computer and use it in GitHub Desktop.
/var/tmp/portage-ondisk/portage/media-gfx/blender-9999/work/blender-9999/intern/rigidbody/rb_bullet_api.cpp.rej
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- intern/rigidbody/rb_bullet_api.cpp | |
+++ intern/rigidbody/rb_bullet_api.cpp | |
@@ -55,17 +55,17 @@ | |
#include "RBI_api.h" | |
-#include "btBulletDynamicsCommon.h" | |
+#include "bullet/btBulletDynamicsCommon.h" | |
-#include "LinearMath/btConvexHullComputer.h" | |
-#include "LinearMath/btMatrix3x3.h" | |
-#include "LinearMath/btScalar.h" | |
-#include "LinearMath/btTransform.h" | |
-#include "LinearMath/btVector3.h" | |
+#include "bullet/LinearMath/btConvexHullComputer.h" | |
+#include "bullet/LinearMath/btMatrix3x3.h" | |
+#include "bullet/LinearMath/btScalar.h" | |
+#include "bullet/LinearMath/btTransform.h" | |
+#include "bullet/LinearMath/btVector3.h" | |
-#include "BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" | |
-#include "BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" | |
-#include "BulletCollision/Gimpact/btGImpactShape.h" | |
+#include "bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h" | |
+#include "bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h" | |
+#include "bullet/BulletCollision/Gimpact/btGImpactShape.h" | |
struct rbDynamicsWorld { | |
btDiscreteDynamicsWorld *dynamicsWorld; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment