griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T72648: Texture Paint color sampling always samples only 1st tile

Browse Source 
when using UDIMS

A more generic approach might be considered in the future (I assume
there are other operators around that need an update in shifting their
uvs) though.

Maniphest Tasks: T72648

Differential Revision: https://developer.blender.org/D6570
This commit is contained in:
Philipp Oeser
2020-01-13 15:09:21 +01:00
parent 27c5fb6fc4
commit 75100d0b94
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/sculpt_paint/paint_utils.c
View File

@@ -519,13 +519,20 @@ void paint_sample_color(
}
if (image) {
ImBuf *ibuf = BKE_image_acquire_ibuf(image, NULL, NULL);
if (ibuf && ibuf->rect) {
float uv[2];
float u, v;
imapaint_pick_uv(me_eval, scene, ob_eval, faceindex, mval, uv);
sample_success = true;
float uv[2];
float u, v;
ImageUser iuser;
BKE_imageuser_default(&iuser);
imapaint_pick_uv(me_eval, scene, ob_eval, faceindex, mval, uv);
if (image->source == IMA_SRC_TILED) {
float new_uv[2];
iuser.tile = BKE_image_get_tile_from_pos(image, uv, new_uv, NULL);
u = new_uv[0];
v = new_uv[1];
}
else {
u = fmodf(uv[0], 1.0f);
v = fmodf(uv[1], 1.0f);
@@ -535,6 +542,11 @@ void paint_sample_color(
if (v < 0.0f) {
v += 1.0f;
}
}
ImBuf *ibuf = BKE_image_acquire_ibuf(image, &iuser, NULL);
if (ibuf && ibuf->rect) {
sample_success = true;
u = u * ibuf->x;
v = v * ibuf->y;