[Bf-blender-cvs] [bddb691dfc8] temp-sculpt-roll-mapping: temp-sculpt-roll-mapping: Fix texture rotation bugs

[Joseph Eagar]

Commit: bddb691dfc8f968efd215b8fd4ee499de37d19c7
Author: Joseph Eagar
Date:   Tue Jan 3 10:34:20 2023 -0800
Branches: temp-sculpt-roll-mapping
https://developer.blender.org/rBbddb691dfc8f968efd215b8fd4ee499de37d19c7

temp-sculpt-roll-mapping: Fix texture rotation bugs

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

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 a8de6aceadf..c9bde27572d 100644
--- a/source/blender/editors/sculpt_paint/sculpt.cc
+++ b/source/blender/editors/sculpt_paint/sculpt.cc
@@ -2656,9 +2656,15 @@ float SCULPT_brush_strength_factor(SculptSession *ss,
         }
       }
 
+      mul_v3_fl(point_3d, 1.0f / ss->cache->initial_radius);
+      float angle = mtex->rot;
+
+      float3 final;
+      rotate_v2_v2fl(final, point_3d, angle);
+
 #if 0 /* Write texture UVs to color attribute*/
       if (SCULPT_has_colors(ss)) {
-        float color[4] = {point_3d[0], point_3d[1], 0.0f, 1.0f};
+        float color[4] = {final[0], final[1], 0.0f, 1.0f};
 
         mul_v3_fl(color, 0.25f / ss->cache->initial_radius);
         color[0] -= floorf(color[0]);
@@ -2669,12 +2675,7 @@ float SCULPT_brush_strength_factor(SculptSession *ss,
       }
 #endif
 
-      mul_v3_fl(point_3d, 1.0f / ss->cache->initial_radius);
-      float angle = mtex->rot - cache->special_rotation;
-      rotate_v2_v2fl(point_3d, point_3d, angle);
-
-
-      avg = paint_get_tex_pixel(mtex, point_3d[0], point_3d[1], ss->tex_pool, thread_id);
+      avg = paint_get_tex_pixel(mtex, final[0], final[1], ss->tex_pool, thread_id);
       avg += br->texture_sample_bias;
     }
     else {