Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2021-10-07 17:07:27 +0300
committerAntonio Vazquez <blendergit@gmail.com>2021-10-07 17:07:27 +0300
commitb53fd38ff327c2f52bf0c2c309e55fdaa549406d (patch)
tree1bc316ee7213cc39e4bb62c0f2d43c54ceeab7c5
parentb31a265adac219f20ab461af1b32cdca2f9f7620 (diff)
-rw-r--r--release/scripts/startup/bl_ui/properties_material.py8
-rw-r--r--release/scripts/startup/bl_ui/properties_material_gpencil.py9
2 files changed, 12 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py
index 5ec634a3bf4..bf8fec81aa6 100644
--- a/release/scripts/startup/bl_ui/properties_material.py
+++ b/release/scripts/startup/bl_ui/properties_material.py
@@ -66,7 +66,9 @@ class MaterialButtonsPanel:
ob = context.active_object
is_scene_render = ob and ob.use_grease_pencil_scene_engine
mat = context.material
- return mat and (((context.engine in cls.COMPAT_ENGINES) and not mat.grease_pencil) or (mat.grease_pencil and mat.use_nodes and is_scene_render))
+ return mat and (((context.engine in cls.COMPAT_ENGINES) and
+ not mat.grease_pencil) or (mat.grease_pencil and
+ mat.use_nodes and is_scene_render))
class MATERIAL_PT_preview(MaterialButtonsPanel, Panel):
@@ -79,7 +81,9 @@ class MATERIAL_PT_preview(MaterialButtonsPanel, Panel):
ob = context.active_object
is_scene_render = ob and ob.use_grease_pencil_scene_engine
mat = context.material
- return mat and (((context.engine in cls.COMPAT_ENGINES) and not mat.grease_pencil) or (mat.grease_pencil and mat.use_nodes and is_scene_render))
+ return mat and (((context.engine in cls.COMPAT_ENGINES) and
+ not mat.grease_pencil) or (mat.grease_pencil and
+ mat.use_nodes and is_scene_render))
def draw(self, context):
self.layout.template_preview(context.material)
diff --git a/release/scripts/startup/bl_ui/properties_material_gpencil.py b/release/scripts/startup/bl_ui/properties_material_gpencil.py
index 8b26b950d5d..8f1902dcca8 100644
--- a/release/scripts/startup/bl_ui/properties_material_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_material_gpencil.py
@@ -262,7 +262,8 @@ class MATERIAL_PT_gpencil_preview(GPMaterialButtonsPanel, Panel):
mat = context.material
ob = context.active_object
is_scene_render = ob and ob.use_grease_pencil_scene_engine
- return (mat and mat.grease_pencil and (mat.use_nodes is False or is_scene_render is False))
+ return (mat and mat.grease_pencil and
+ (mat.use_nodes is False or is_scene_render is False))
def draw(self, context):
ma = context.material
@@ -280,7 +281,8 @@ class MATERIAL_PT_gpencil_custom_props(GPMaterialButtonsPanel, PropertyPanel, Pa
mat = context.material
ob = context.active_object
is_scene_render = ob and ob.use_grease_pencil_scene_engine
- return (mat and mat.grease_pencil and (mat.use_nodes is False or is_scene_render is False))
+ return (mat and mat.grease_pencil and
+ (mat.use_nodes is False or is_scene_render is False))
def draw_material_settings(self, context):
@@ -319,7 +321,8 @@ class MATERIAL_PT_gpencil_settings(GPMaterialButtonsPanel, Panel):
mat = context.material
ob = context.active_object
is_scene_render = ob and ob.use_grease_pencil_scene_engine
- return (mat and mat.grease_pencil and (mat.use_nodes is False or is_scene_render is False))
+ return (mat and mat.grease_pencil and
+ (mat.use_nodes is False or is_scene_render is False))
def draw(self, context):
draw_material_settings(self, context)