[Bf-blender-cvs] [01d0903f1e9] master: EEVEE+Workbench: Show partsys in final rendering

[Jeroen Bakker]

Commit: 01d0903f1e93bfa0933adfd1d55fb669948e013f
Author: Jeroen Bakker
Date:   Thu Apr 4 15:07:30 2019 +0200
Branches: master
https://developer.blender.org/rB01d0903f1e93bfa0933adfd1d55fb669948e013f

EEVEE+Workbench: Show partsys in final rendering

In final rendering mode the display type was tested for
visibility flag. This should only occus when doing viewport
rendering

Reviewed By: fclem

Maniphest Tasks: T63056

Differential Revision: https://developer.blender.org/D4643

===================================================================

M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/engines/workbench/workbench_deferred.c

===================================================================

diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 99a3c0c06cc..32ec54b1ca6 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1551,7 +1551,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
 		 */
 		bool use_volume_material = (gpumat_array[0] && GPU_material_use_domain_volume(gpumat_array[0]));
 
-		if (ob->dt >= OB_SOLID) {
+		if (DRW_state_is_image_render() || ob->dt >= OB_SOLID) {
 			/* Get per-material split surface */
 			char *auto_layer_names;
 			int *auto_layer_is_srgb;
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 4afc692455c..8ea90a21e78 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -897,7 +897,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
 	if (!(DRW_object_visibility_in_active_context(ob) & OB_VISIBLE_SELF)) {
 		return;
 	}
-	if (ob->dt < OB_SOLID) {
+	if (!DRW_state_is_image_render() && ob->dt < OB_SOLID) {
 		return;
 	}