[Bf-blender-cvs] [9fdd21d1531] temp-eevee-gpencil-rewrite: Basic show material panel

[Antonio Vazquez]

Commit: 9fdd21d1531a243ffd03a85368d97aaf4609c263
Author: Antonio Vazquez
Date:   Tue Oct 5 14:13:30 2021 +0200
Branches: temp-eevee-gpencil-rewrite
https://developer.blender.org/rB9fdd21d1531a243ffd03a85368d97aaf4609c263

Basic show material panel

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

M	release/scripts/startup/bl_ui/properties_material.py

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

diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 1c7f3639f0a..a32f3ed4042 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -93,8 +93,9 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel):
         ob = context.object
         mat = context.material
 
-        if (ob and ob.type == 'GPENCIL') or (mat and mat.grease_pencil):
-            return False
+        if (ob and ob.type == 'GPENCIL' and ob.use_grease_pencil_scene_engine is False):
+            if mat and mat.grease_pencil:
+                return False
 
         return (ob or mat) and (context.engine in cls.COMPAT_ENGINES)