Blender Git Loki

Git Commits -> Revision 5b2cebf

Revision 5b2cebf by Philipp Oeser (master)
September 12, 2019, 16:23 (GMT)
Fix T69752: Texture paint sampling colors always 'merged down'

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

Commit Details:

Full Hash: 5b2cebf49bc6e17fd75ab43e33387fc1b257d710
Parent Commit: 2ea82e8
Lines Changed: +9, -16

2 Modified Paths:

/source/blender/draw/engines/select/select_draw_utils.c (+9, -9) (Diff)
/source/blender/draw/engines/select/select_engine.c (+0, -7) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021