archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T69752: Texture paint sampling colors always 'merged down'

Browse Source 
Rgression from rBaf4dcc6073fa.

paint_sample_color > imapaint_pick_face uses the the selection buffer
(DRW_select_buffer_sample_point) and to get flat colors [select_id_flat] we
need to be in SCE_SELECT_FACE mode. This was already fine if you had
'Face Selection Masking' turned on, but got colors including lighting
when turned of [select_id_uniform].

There was already an exception in 'select_cache_init' that turns on
SCE_SELECT_FACE for weightpaint, we just need this for texture paint
(vertex paint) as well... Also moved the logic into
select_id_get_object_select_mode.

Note we were also asserting here:
BLI_assert failed: /blender/source/blender/draw/engines/select/
select_engine.c:174, select_cache_init(), at 'e_data.context.select_mode
!= 0'

Note also this is not working correctly for vertexpaint (yet), but has
been discussed in T69752 and there is a solution by @mano-wii in P1032.

Reviewers: mano-wii

Subscribers: mano-wii

Maniphest Tasks: T69752

Differential Revision: https://developer.blender.org/D5775
This commit is contained in:
Philipp Oeser
2019-09-12 14:14:40 +02:00
parent 2ea82e86ca
commit 5b2cebf49b
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/draw/engines/select/select_draw_utils.c
View File

@@ -62,18 +62,18 @@ void select_id_object_min_max(Object *obj, float r_min[3], float r_max[3])
short select_id_get_object_select_mode(Scene *scene, Object *ob)
{
short r_select_mode = 0;
if (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT)) {
if (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) {
/* In order to sample flat colors for vertex weights / texturepaint / vertexpaint
* we need to be in SCE_SELECT_FACE mode so select_cache_init() correctly sets up
* a shgroup with select_id_flat.
* Note this is not working correctly for vertexpaint (yet), but has been discussed
* in T66645 and there is a solution by @mano-wii in P1032.
* So OB_MODE_VERTEX_PAINT is already included here [required for P1032 I guess]. */
Mesh *me_orig = DEG_get_original_object(ob)->data;
if (me_orig->editflag & ME_EDIT_PAINT_FACE_SEL) {
r_select_mode = SCE_SELECT_FACE;
}
else if (me_orig->editflag & ME_EDIT_PAINT_VERT_SEL) {
if (me_orig->editflag & ME_EDIT_PAINT_VERT_SEL) {
r_select_mode = SCE_SELECT_VERTEX;
}
}
else if (ob->mode & OB_MODE_TEXTURE_PAINT) {
Mesh *me_orig = DEG_get_original_object(ob)->data;
if (me_orig->editflag & ME_EDIT_PAINT_FACE_SEL) {
else {
r_select_mode = SCE_SELECT_FACE;
}
}

7
source/blender/draw/engines/select/select_engine.c
View File

@@ -163,13 +163,6 @@ static void select_cache_init(void *vedata)
if (e_data.context.select_mode == -1) {
e_data.context.select_mode = select_id_get_object_select_mode(draw_ctx->scene,
draw_ctx->obact);
if (e_data.context.select_mode == 0) {
/* Need for sampling weights. */
if (draw_ctx->object_mode & OB_MODE_WEIGHT_PAINT) {
e_data.context.select_mode = SCE_SELECT_FACE;
}
}
BLI_assert(e_data.context.select_mode != 0);
}