diff options
-rw-r--r-- | source/blender/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/simulation/BPH_mass_spring.h (renamed from source/blender/physics/BPH_mass_spring.h) | 0 | ||||
-rw-r--r-- | source/blender/simulation/CMakeLists.txt (renamed from source/blender/physics/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/BPH_mass_spring.cpp (renamed from source/blender/physics/intern/BPH_mass_spring.cpp) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/ConstrainedConjugateGradient.h (renamed from source/blender/physics/intern/ConstrainedConjugateGradient.h) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/eigen_utils.h (renamed from source/blender/physics/intern/eigen_utils.h) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/hair_volume.cpp (renamed from source/blender/physics/intern/hair_volume.cpp) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/implicit.h (renamed from source/blender/physics/intern/implicit.h) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/implicit_blender.c (renamed from source/blender/physics/intern/implicit_blender.c) | 0 | ||||
-rw-r--r-- | source/blender/simulation/intern/implicit_eigen.cpp (renamed from source/blender/physics/intern/implicit_eigen.cpp) | 0 |
13 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 50edb0b55ee..e178b0f7935 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -112,7 +112,7 @@ add_subdirectory(blentranslation) add_subdirectory(blenloader) add_subdirectory(depsgraph) add_subdirectory(ikplugin) -add_subdirectory(physics) +add_subdirectory(simulation) add_subdirectory(gpu) add_subdirectory(imbuf) add_subdirectory(nodes) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 97a283abbfb..30e6baf1a9d 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -36,7 +36,7 @@ set(INC ../makesrna ../modifiers ../nodes - ../physics + ../simulation ../shader_fx ../render/extern/include ../../../intern/ghost diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index c2f1e204073..a6ed705ec67 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -360,7 +360,7 @@ blender_include_dirs( ../../imbuf ../../makesdna ../../nodes/ - ../../physics + ../../simulation ../../windowmanager ../../editors/include ../../render/extern/include diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index f49c68a258d..e3c3cf712f9 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -32,7 +32,7 @@ set(INC ../makesdna ../makesrna ../nodes - ../physics + ../simulation ../../../intern/atomic ../../../intern/guardedalloc ../../../intern/mikktspace diff --git a/source/blender/physics/BPH_mass_spring.h b/source/blender/simulation/BPH_mass_spring.h index 5a8c78812a4..5a8c78812a4 100644 --- a/source/blender/physics/BPH_mass_spring.h +++ b/source/blender/simulation/BPH_mass_spring.h diff --git a/source/blender/physics/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index 10520a18513..10520a18513 100644 --- a/source/blender/physics/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/simulation/intern/BPH_mass_spring.cpp index 051f11aa1d9..051f11aa1d9 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/simulation/intern/BPH_mass_spring.cpp diff --git a/source/blender/physics/intern/ConstrainedConjugateGradient.h b/source/blender/simulation/intern/ConstrainedConjugateGradient.h index c924490f97d..c924490f97d 100644 --- a/source/blender/physics/intern/ConstrainedConjugateGradient.h +++ b/source/blender/simulation/intern/ConstrainedConjugateGradient.h diff --git a/source/blender/physics/intern/eigen_utils.h b/source/blender/simulation/intern/eigen_utils.h index c186cf567df..c186cf567df 100644 --- a/source/blender/physics/intern/eigen_utils.h +++ b/source/blender/simulation/intern/eigen_utils.h diff --git a/source/blender/physics/intern/hair_volume.cpp b/source/blender/simulation/intern/hair_volume.cpp index 1764d0a910c..1764d0a910c 100644 --- a/source/blender/physics/intern/hair_volume.cpp +++ b/source/blender/simulation/intern/hair_volume.cpp diff --git a/source/blender/physics/intern/implicit.h b/source/blender/simulation/intern/implicit.h index 8bc09755180..8bc09755180 100644 --- a/source/blender/physics/intern/implicit.h +++ b/source/blender/simulation/intern/implicit.h diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c index 54d38f3c10b..54d38f3c10b 100644 --- a/source/blender/physics/intern/implicit_blender.c +++ b/source/blender/simulation/intern/implicit_blender.c diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/simulation/intern/implicit_eigen.cpp index 58538c13116..58538c13116 100644 --- a/source/blender/physics/intern/implicit_eigen.cpp +++ b/source/blender/simulation/intern/implicit_eigen.cpp |