maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Blender 2.9: Improve material blending panel UI

Browse source
This commit is contained in:
Moritz Brückner 2021-01-14 20:57:44 +01:00
parent 1b9f010c57
commit a98559ea7f
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blender/arm/props.py
View file

@ -391,7 +391,7 @@ def init_properties():
('destination_color', 'Destination Color', 'Destination Color'),
('inverse_source_color', 'Inverse Source Color', 'Inverse Source Color'),
('inverse_destination_color', 'Inverse Destination Color', 'Inverse Destination Color')],
name='Source', default='blend_one', description='Blending factor', update=assets.invalidate_shader_cache)
name='Source (Alpha)', default='blend_one', description='Blending factor', update=assets.invalidate_shader_cache)
bpy.types.Material.arm_blending_destination_alpha = EnumProperty(
items=[('blend_one', 'One', 'One'),
('blend_zero', 'Zero', 'Zero'),
@ -403,14 +403,14 @@ def init_properties():
('destination_color', 'Destination Color', 'Destination Color'),
('inverse_source_color', 'Inverse Source Color', 'Inverse Source Color'),
('inverse_destination_color', 'Inverse Destination Color', 'Inverse Destination Color')],
name='Destination', default='blend_one', description='Blending factor', update=assets.invalidate_shader_cache)
name='Destination (Alpha)', default='blend_one', description='Blending factor', update=assets.invalidate_shader_cache)
bpy.types.Material.arm_blending_operation_alpha = EnumProperty(
items=[('add', 'Add', 'Add'),
('subtract', 'Subtract', 'Subtract'),
('reverse_subtract', 'Reverse Subtract', 'Reverse Subtract'),
('min', 'Min', 'Min'),
('max', 'Max', 'Max')],
name='Operation', default='add', description='Blending operation', update=assets.invalidate_shader_cache)
name='Operation (Alpha)', default='add', description='Blending operation', update=assets.invalidate_shader_cache)
# For scene
bpy.types.Scene.arm_export = BoolProperty(name="Export", description="Export scene data", default=True)
bpy.types.Scene.arm_terrain_textures = StringProperty(name="Textures", description="Set root folder for terrain assets", default="//Bundled/", subtype="DIR_PATH")

10
blender/arm/props_ui.py
View file

@ -369,7 +369,7 @@ class ARM_PT_MaterialBlendingPropsPanel(bpy.types.Panel):
bl_parent_id = "ARM_PT_MaterialPropsPanel"
def draw_header(self, context):
if context.material == None:
if context.material is None:
return
self.layout.prop(context.material, 'arm_blending', text="")
@ -378,16 +378,18 @@ class ARM_PT_MaterialBlendingPropsPanel(bpy.types.Panel):
layout.use_property_split = True
layout.use_property_decorate = False
mat = bpy.context.material
if mat == None:
if mat is None:
return
flow = layout.grid_flow()
flow.enabled = mat.arm_blending
col = flow.column()
col = flow.column(align=True)
col.prop(mat, 'arm_blending_source')
col.prop(mat, 'arm_blending_destination')
col.prop(mat, 'arm_blending_operation')
col = flow.column()
flow.separator()
col = flow.column(align=True)
col.prop(mat, 'arm_blending_source_alpha')
col.prop(mat, 'arm_blending_destination_alpha')
col.prop(mat, 'arm_blending_operation_alpha')