Page MenuHome
Differential D5416 Diff 16848 source/blender/editors/sculpt_paint/paint_image_proj.c

Changeset View

Standalone View

View Options

source/blender/editors/sculpt_paint/paint_image_proj.c

Context not available.
cell->y2 = max_ii(cell->y2, (int)projPixel->y_px + 1); cell->y2 = max_ii(cell->y2, (int)projPixel->y_px + 1);
} }
static void use_old_alpha_channel(ProjPixel *pixel, bool is_floatbuf)
brechtUnsubmitted
Not Done
Inline Actions

use_old_alpha_channel -> copy_original_alpha_channel

brecht: `use_old_alpha_channel` -> `copy_original_alpha_channel`
{
/* Use the original alpha channel data instead of the modified one */
if (is_floatbuf) {
/* slightly more involved case since floats are in premultiplied space we need
* to make sure alpha is consistent, see T44627 */
float rgb_straight[4];
premul_to_straight_v4_v4(rgb_straight, pixel->pixel.f_pt);
rgb_straight[3] = pixel->origColor.f_pt[3];
straight_to_premul_v4_v4(pixel->pixel.f_pt, rgb_straight);
}
else {
pixel->pixel.ch_pt[3] = pixel->origColor.ch_pt[3];
}
}
/* Run this for single and multi-threaded painting. */ /* Run this for single and multi-threaded painting. */
static void do_projectpaint_thread(TaskPool *__restrict UNUSED(pool), static void do_projectpaint_thread(TaskPool *__restrict UNUSED(pool),
void *ph_v, void *ph_v,
Context not available.
} }
if (lock_alpha) { if (lock_alpha) {
if (is_floatbuf) { use_old_alpha_channel(projPixel, is_floatbuf);
/* slightly more involved case since floats are in premultiplied space we need
* to make sure alpha is consistent, see T44627 */
float rgb_straight[4];
premul_to_straight_v4_v4(rgb_straight, projPixel->pixel.f_pt);
rgb_straight[3] = projPixel->origColor.f_pt[3];
straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight);
}
else {
projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3];
}
} }
last_partial_redraw_cell = last_projIma->partRedrawRect + projPixel->bb_cell_index; last_partial_redraw_cell = last_projIma->partRedrawRect + projPixel->bb_cell_index;
Context not available.
} }
if (lock_alpha) { if (lock_alpha) {
if (is_floatbuf) { use_old_alpha_channel(projPixel, is_floatbuf);
/* slightly more involved case since floats are in premultiplied space we need
* to make sure alpha is consistent, see T44627 */
float rgb_straight[4];
premul_to_straight_v4_v4(rgb_straight, projPixel->pixel.f_pt);
rgb_straight[3] = projPixel->origColor.f_pt[3];
straight_to_premul_v4_v4(projPixel->pixel.f_pt, rgb_straight);
}
else {
projPixel->pixel.ch_pt[3] = projPixel->origColor.ch_pt[3];
}
} }
} }
Context not available.
for (node = smearPixels; node; node = node->next) { /* this wont run for a float image */ for (node = smearPixels; node; node = node->next) { /* this wont run for a float image */
projPixel = node->link; projPixel = node->link;
*projPixel->pixel.uint_pt = ((ProjPixelClone *)projPixel)->clonepx.uint; *projPixel->pixel.uint_pt = ((ProjPixelClone *)projPixel)->clonepx.uint;
if (lock_alpha) {
use_old_alpha_channel(projPixel, false);
}
} }
for (node = smearPixels_f; node; node = node->next) { for (node = smearPixels_f; node; node = node->next) {
projPixel = node->link; projPixel = node->link;
copy_v4_v4(projPixel->pixel.f_pt, ((ProjPixelClone *)projPixel)->clonepx.f); copy_v4_v4(projPixel->pixel.f_pt, ((ProjPixelClone *)projPixel)->clonepx.f);
if (lock_alpha) {
use_old_alpha_channel(projPixel, true);
}
} }
BLI_memarena_free(smearArena); BLI_memarena_free(smearArena);
Context not available.
for (node = softenPixels; node; node = node->next) { /* this wont run for a float image */ for (node = softenPixels; node; node = node->next) { /* this wont run for a float image */
projPixel = node->link; projPixel = node->link;
*projPixel->pixel.uint_pt = projPixel->newColor.uint; *projPixel->pixel.uint_pt = projPixel->newColor.uint;
if (lock_alpha) {
use_old_alpha_channel(projPixel, false);
}
} }
for (node = softenPixels_f; node; node = node->next) { for (node = softenPixels_f; node; node = node->next) {
projPixel = node->link; projPixel = node->link;
copy_v4_v4(projPixel->pixel.f_pt, projPixel->newColor.f); copy_v4_v4(projPixel->pixel.f_pt, projPixel->newColor.f);
if (lock_alpha) {
use_old_alpha_channel(projPixel, true);
}
} }
BLI_memarena_free(softenArena); BLI_memarena_free(softenArena);
Context not available.