From c384b5ddbdcb4c0b26e55a824681db1f9753e496 Mon Sep 17 00:00:00 2001
From: Benjamin Meyer <>
Date: Thu, 4 Apr 2019 10:39:12 +0200
Subject: 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
---
 release/datafiles/locale                        | 2 +-
 release/scripts/addons                          | 2 +-
 release/scripts/addons_contrib                  | 2 +-
 source/blender/modifiers/intern/MOD_collision.c | 6 +++++-
 source/tools                                    | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 345b7d27872..199b3a7c2f0 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 345b7d27872d87ae5074a83d8b9995b37bc56f1b
+Subproject commit 199b3a7c2f03a3af6f612e092d3359f7b6f288cc
diff --git a/release/scripts/addons b/release/scripts/addons
index cd9213d669f..3683429de05 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit cd9213d669fa8cd585dcadb1a5b09fcdedd1212e
+Subproject commit 3683429de050b8026835d17ae7288a436c31cdb6
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 4c5ddaeb2d1..ca68e1d4e01 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 4c5ddaeb2d1953ea9db10b2fdde2f93e19b1d6d7
+Subproject commit ca68e1d4e01d343b1758118b500bdc92eaea30ee
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 371a33ebfc6..2e56da6f100 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -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,
diff --git a/source/tools b/source/tools
index 279c373280e..d96e3148dea 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 279c373280e54388ede50abea9d11d5cdaa1d567
+Subproject commit d96e3148deaea3eab7b5dbddfd2bffaa61ad2487
-- 
cgit v1.2.3