blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix: Erratic collision response when using constraints on colliders 

Missing dependency, which made collission to access object transform
prior it was evaluated.

Reviewers: sergey

Differential Revision: https://developer.blender.org/D4636
This commit is contained in:
Benjamin Meyer 2019-04-04 10:39:12 +02:00 committed by Sergey Sharybin
parent aa00019de0
commit c384b5ddbd
Notes: blender-bot 2023-02-14 06:49:57 +01:00 
Referenced by issue #84340, Regression: hi-poly mesh with collision in empty scene causes low fps.
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 345b7d27872d87ae5074a83d8b9995b37bc56f1b
Subproject commit 199b3a7c2f03a3af6f612e092d3359f7b6f288cc

2
release/scripts/addons

@ -1 +1 @@
Subproject commit cd9213d669fa8cd585dcadb1a5b09fcdedd1212e
Subproject commit 3683429de050b8026835d17ae7288a436c31cdb6

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 4c5ddaeb2d1953ea9db10b2fdde2f93e19b1d6d7
Subproject commit ca68e1d4e01d343b1758118b500bdc92eaea30ee

6
source/blender/modifiers/intern/MOD_collision.c
View File

@ -240,6 +240,10 @@ static void deformVerts(
}
}
static void updateDepsgraph(ModifierData *UNUSED(md), const ModifierUpdateDepsgraphContext *ctx)
{
DEG_add_modifier_to_transform_relation(ctx->node, "Collision Modifier");
}
ModifierTypeInfo modifierType_Collision = {
/* name */ "Collision",
@ -261,7 +265,7 @@ ModifierTypeInfo modifierType_Collision = {
/* requiredDataMask */ NULL,
/* freeData */ freeData,
/* isDisabled */ NULL,
/* updateDepsgraph */ NULL,
/* updateDepsgraph */ updateDepsgraph,
/* dependsOnTime */ dependsOnTime,
/* dependsOnNormals */ NULL,
/* foreachObjectLink */ NULL,

2
source/tools

@ -1 +1 @@
Subproject commit 279c373280e54388ede50abea9d11d5cdaa1d567
Subproject commit d96e3148deaea3eab7b5dbddfd2bffaa61ad2487