[Bf-blender-cvs] [028beb9f773] cycles_procedural_api: fix for race condition in motion blur sockets update

[Kévin Dietrich]

Commit: 028beb9f773e44368ce13695048be84744b7a67c
Author: Kévin Dietrich
Date:   Wed Oct 28 15:19:14 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB028beb9f773e44368ce13695048be84744b7a67c

fix for race condition in motion blur sockets update

===================================================================

M	intern/cycles/blender/blender_curves.cpp
M	intern/cycles/blender/blender_mesh.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index 1af592fc8ab..fd57da05e9c 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -846,6 +846,10 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph,
   /* update original sockets */
 
   for (const SocketType &socket : new_hair.type->inputs) {
+    /* Those sockets are updated in sync_object, so do not modify them. */
+    if (socket.name == "use_motion_blur" || socket.name == "motion_steps") {
+      continue;
+    }
     hair->set_value(socket, new_hair, socket);
   }
 
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index ed1075c7e53..46de1134436 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1063,6 +1063,10 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph,
   /* update original sockets */
 
   for (const SocketType &socket : new_mesh.type->inputs) {
+    /* Those sockets are updated in sync_object, so do not modify them. */
+    if (socket.name == "use_motion_blur" || socket.name == "motion_steps") {
+      continue;
+    }
     mesh->set_value(socket, new_mesh, socket);
   }