Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/softbody/src/admmpd_collision.cpp')
-rw-r--r--extern/softbody/src/admmpd_collision.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/extern/softbody/src/admmpd_collision.cpp b/extern/softbody/src/admmpd_collision.cpp
index 9508b74a740..4d2444e6a52 100644
--- a/extern/softbody/src/admmpd_collision.cpp
+++ b/extern/softbody/src/admmpd_collision.cpp
@@ -219,6 +219,12 @@ int EmbeddedMeshCollision::detect(
if (mesh==NULL)
return 0;
+ // Do we even need to process collisions?
+ if (!this->settings.test_floor &&
+ !this->settings.self_collision &&
+ this->obsdata.F.rows()==0)
+ return 0;
+
update_bvh(x0,x1);
int max_threads = std::max(1,BLI_system_thread_count());