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

Workbench: Disable texture paint drawing for final render

Browse Source
This commit is contained in:
Jeroen Bakker
2019-07-05 15:40:48 +02:00
parent d1349bd0c7
commit 3c7814d7de
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/engines/workbench/workbench_deferred.c
View File

@@ -1026,7 +1026,9 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
const int materials_len = MAX2(1, ob->totcol);
const Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL;
bool has_transp_mat = false;
const bool use_texture_paint_drawing = workbench_is_object_in_texture_paint_mode(ob) && me &&
const bool use_texture_paint_drawing = !(DRW_state_is_image_render() &&
draw_ctx->v3d == NULL) &&
workbench_is_object_in_texture_paint_mode(ob) && me &&
me->mloopuv;
if (use_texture_paint_drawing) {

4
source/blender/draw/engines/workbench/workbench_forward.c
View File

@@ -628,7 +628,9 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
const bool use_sculpt_pbvh = BKE_sculptsession_use_pbvh_draw(ob, draw_ctx->v3d);
const int materials_len = MAX2(1, ob->totcol);
const Mesh *me = (ob->type == OB_MESH) ? ob->data : NULL;
const bool use_texture_paint_drawing = workbench_is_object_in_texture_paint_mode(ob) && me &&
const bool use_texture_paint_drawing = !(DRW_state_is_image_render() &&
draw_ctx->v3d == NULL) &&
workbench_is_object_in_texture_paint_mode(ob) && me &&
me->mloopuv;
if (use_texture_paint_drawing) {