[Bf-blender-cvs] [4395d7eb27e] temp-lineart-contained: Fix T88145: Dynamic Paint initial color using vertex color not working as expected

[Philipp Oeser]

Commit: 4395d7eb27e5a6b78710d5a8fd5f78d064a34cd9
Author: Philipp Oeser
Date:   Mon May 10 11:33:01 2021 +0200
Branches: temp-lineart-contained
https://developer.blender.org/rB4395d7eb27e5a6b78710d5a8fd5f78d064a34cd9

Fix T88145: Dynamic Paint initial color using vertex color not working as expected

Mistake in {rBe48c4d73d378}.

Was using the vertex index as a lookup for the loop color (instead of
the loop index).
(Issue was not present in original D1429 btw).

Maniphest Tasks: T88145

Differential Revision: https://developer.blender.org/D11212

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

M	source/blender/blenkernel/intern/dynamicpaint.c

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

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 4a25b0e9d98..42af3a391ed 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1702,7 +1702,7 @@ static void dynamicPaint_setInitialColor(const Scene *scene, DynamicPaintSurface
       }
 
       for (int i = 0; i < totloop; i++) {
-        rgba_uchar_to_float(pPoint[mloop[i].v].color, (const unsigned char *)&col[mloop[i].v].r);
+        rgba_uchar_to_float(pPoint[mloop[i].v].color, (const unsigned char *)&col[i].r);
       }
     }
     else if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) {