[Bf-blender-cvs] [c2c2f0b284d] temp-eevee-gpencil-rewrite: Create material depending of type

[Antonio Vazquez]

Commit: c2c2f0b284d8f169e93b04dbdabe95325da50160
Author: Antonio Vazquez
Date:   Tue Oct 5 16:08:29 2021 +0200
Branches: temp-eevee-gpencil-rewrite
https://developer.blender.org/rBc2c2f0b284d8f169e93b04dbdabe95325da50160

Create material depending of type

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

M	source/blender/editors/render/render_shading.c
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c
index 7b2667905ff..737efd76118 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -767,7 +767,7 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
   }
   else {
     const char *name = DATA_("Material");
-    if (!(ob != NULL && ob->type == OB_GPENCIL)) {
+    if ((!(ob != NULL && ob->type == OB_GPENCIL)) || (GP_OBJECT_USE_SCENE_RENDER(ob))) {
       ma = BKE_material_add(bmain, name);
     }
     else {
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 76a9e0dcba9..f00554b2ddd 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -231,6 +231,9 @@ enum eObjectLineArt_Flags {
   OBJECT_LRT_OWN_CREASE = (1 << 0),
 };
 
+#define GP_OBJECT_USE_SCENE_RENDER(ob) \
+((ob) && ((ob->dtx & OB_USE_GPENCIL_SCENE_ENGINE) != 0))
+
 typedef struct Object {
   ID id;
   /** Animation data (must be immediately after id for utilities to use it). */