[Bf-blender-cvs] [3dd3a0f02e4] temp-sculpt-roll-mapping: temp-sculpt-roll-mapping: Fix deadlock

Joseph Eagar noreply at git.blender.org
Tue Jan 24 17:54:39 CET 2023


Commit: 3dd3a0f02e4db155d6fe6ca6e349abea39b524f7
Author: Joseph Eagar
Date:   Tue Jan 24 08:54:12 2023 -0800
Branches: temp-sculpt-roll-mapping
https://developer.blender.org/rB3dd3a0f02e4db155d6fe6ca6e349abea39b524f7

temp-sculpt-roll-mapping: Fix deadlock

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

M	source/blender/editors/sculpt_paint/sculpt.cc

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc
index 3394bb2a895..548484bd32c 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -2697,7 +2697,7 @@ float SCULPT_brush_strength_factor(SculptSession *ss,
     }
     else {
       const float point_3d[3] = {point_2d[0], point_2d[1], 0.0f};
-      avg = BKE_brush_sample_tex_3d(scene, br, mtex, point_3d, rgba, 0, ss->tex_pool);
+      avg = BKE_brush_sample_tex_3d(scene, br, mtex, point_3d, rgba, thread_id, ss->tex_pool);
     }
   }



More information about the Bf-blender-cvs mailing list