[Bf-blender-cvs] [695b48b1288] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: 695b48b1288fbd12208cee20feb9e0c382e00338
Author: Hans Goudey
Date:   Tue Jan 3 10:25:16 2023 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB695b48b1288fbd12208cee20feb9e0c382e00338

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/editors/sculpt_paint/paint_image_proj.cc
index a68f3a31d2d,61aa984c1af..5ecf9a84ca1
--- a/source/blender/editors/sculpt_paint/paint_image_proj.cc
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc
@@@ -3816,12 -3815,12 +3814,12 @@@ static void proj_paint_state_screen_coo
    projScreenCo = *ps->screenCoords;
  
    if (ps->is_ortho) {
 -    for (a = 0, mv = ps->mvert_eval; a < ps->totvert_eval; a++, mv++, projScreenCo += 4) {
 -      mul_v3_m4v3(projScreenCo, ps->projectMat, mv->co);
 +    for (a = 0; a < ps->totvert_eval; a++, projScreenCo += 4) {
 +      mul_v3_m4v3(projScreenCo, ps->projectMat, ps->positions_eval[a]);
  
        /* screen space, not clamped */
-       projScreenCo[0] = (float)(ps->winx * 0.5f) + (ps->winx * 0.5f) * projScreenCo[0];
-       projScreenCo[1] = (float)(ps->winy * 0.5f) + (ps->winy * 0.5f) * projScreenCo[1];
+       projScreenCo[0] = float(ps->winx * 0.5f) + (ps->winx * 0.5f) * projScreenCo[0];
+       projScreenCo[1] = float(ps->winy * 0.5f) + (ps->winy * 0.5f) * projScreenCo[1];
        minmax_v2v2_v2(ps->screenMin, ps->screenMax, projScreenCo);
      }
    }