Blender Git Loki
Git Commits -> Revision d1349bd
Revision d1349bd by Jeroen Bakker (master) July 5, 2019, 13:21 (GMT) |
TexturePaint: Force Workbench Texture Color Mode When in texture paint mode and in solid mode the object that is being texture painted will be rendered by the workbench engine with textures. All other objects would render the same. For other cases the texture paint draw engine will still draw the texture. The texture mode draw engine now only drawn the masks. The opacity sliders influences the texture mask. This change has been implemented conserably. In the future we need to look into making this better, like adding support that every object can be colored differently. Currently when rendering in the workbench we can have up to 3 different color types active (what the user selected, the fallback in case no materials have been configured and this one, forcing textures) Reviewed By: fclem, brecht Differential Revision: https://developer.blender.org/D5190 |
Commit Details:
Full Hash: d1349bd0c7da2993b408bfd9a8eda0ab802272ed
Parent Commit: 15cc4c4
Lines Changed: +292, -267
9 Modified Paths:
/source/blender/draw/engines/workbench/workbench_deferred.c (+75, -19) (Diff)
/source/blender/draw/engines/workbench/workbench_forward.c (+88, -26) (Diff)
/source/blender/draw/engines/workbench/workbench_materials.c (+39, -14) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+38, -8) (Diff)
/source/blender/draw/modes/paint_texture_mode.c (+44, -166) (Diff)
/source/blender/draw/modes/shaders/paint_texture_frag.glsl (+2, -21) (Diff)
/source/blender/draw/modes/shaders/paint_texture_vert.glsl (+0, -12) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+2, -1) (Diff)
/source/blender/draw/engines/workbench/workbench_forward.c (+88, -26) (Diff)
/source/blender/draw/engines/workbench/workbench_materials.c (+39, -14) (Diff)
/source/blender/draw/engines/workbench/workbench_private.h (+38, -8) (Diff)
/source/blender/draw/modes/paint_texture_mode.c (+44, -166) (Diff)
/source/blender/draw/modes/shaders/paint_texture_frag.glsl (+2, -21) (Diff)
/source/blender/draw/modes/shaders/paint_texture_vert.glsl (+0, -12) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+2, -1) (Diff)