GOOENGINE: Restore Eevee defaults
Scene defaults to eevee Versioning for eevee Restore eevee bloom NULL replace nullptr Eevee versioing for Goo Nodes Fix UI changes Update Splash image
This commit is contained in:
@@ -343,6 +343,7 @@ class NODE_MT_category_goo_engine(Menu):
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeSdfVectorOp")
|
||||
node_add_menu.add_node_type(layout, "ShaderNodeSdfNoise")
|
||||
|
||||
|
||||
class NODE_MT_category_shader_script(Menu):
|
||||
bl_idname = "NODE_MT_category_shader_script"
|
||||
bl_label = "Script"
|
||||
|
||||
@@ -401,7 +401,7 @@ class ConstraintButtonsPanel:
|
||||
sub.prop(con, "invert_y", text="Y", toggle=True)
|
||||
sub.prop(con, "invert_z", text="Z", toggle=True)
|
||||
row.label(icon='BLANK1')
|
||||
|
||||
|
||||
layout.prop(con, "invert_all", text="Invert Rotation")
|
||||
|
||||
layout.prop(con, "mix_mode", text="Mix", text_ctxt=i18n_contexts.constraint)
|
||||
|
||||
@@ -353,9 +353,13 @@ class BONE_PT_display(BoneButtonsPanel, Panel):
|
||||
|
||||
col = layout.column()
|
||||
col.prop(bone, "hide", text="Hide", toggle=False)
|
||||
if (pchan := context.object.pose.bones[bone.name]) and context.bone:
|
||||
col.prop(pchan, "hide_outliner", text="Hide in Outliner", toggle=False)
|
||||
|
||||
layout.prop(bone.color, "palette", text="Bone Color")
|
||||
self.draw_bone_color_ui(layout, bone.color)
|
||||
|
||||
|
||||
def draw_bone_color_ui(self, layout, bone_color):
|
||||
if not bone_color.is_custom:
|
||||
return
|
||||
@@ -374,9 +378,6 @@ class BONE_PT_display(BoneButtonsPanel, Panel):
|
||||
row.prop(bone_color.custom, "select", text="")
|
||||
row.prop(bone_color.custom, "active", text="")
|
||||
|
||||
if (pchan := context.object.pose.bones[bone.name]) and context.bone:
|
||||
col.prop(pchan, "hide_outliner", text="Hide in Outliner", toggle=False)
|
||||
|
||||
|
||||
class BONE_PT_display_custom_shape(BoneButtonsPanel, Panel):
|
||||
bl_label = "Custom Shape"
|
||||
|
||||
@@ -280,6 +280,29 @@ def draw_material_surface_settings(layout, mat, is_eevee=True):
|
||||
col.prop(mat, "use_thickness_from_shadow", text="From Shadow")
|
||||
|
||||
|
||||
def draw_goo_material_surface_settings(layout, mat):
|
||||
layout.use_property_split = True
|
||||
layout.use_property_decorate = False
|
||||
|
||||
layout.prop(mat, "use_backface_culling")
|
||||
layout.prop(mat, "blend_method")
|
||||
layout.prop(mat, "shadow_method")
|
||||
|
||||
layout.prop(mat, "check_shadow_id")
|
||||
|
||||
row = layout.row()
|
||||
row.active = ((mat.blend_method == 'CLIP') or (mat.shadow_method == 'CLIP'))
|
||||
row.prop(mat, "alpha_threshold")
|
||||
|
||||
if mat.blend_method not in {'OPAQUE', 'CLIP', 'HASHED'}:
|
||||
layout.prop(mat, "show_transparent_back")
|
||||
|
||||
layout.prop(mat, "use_screen_refraction")
|
||||
layout.prop(mat, "refraction_depth")
|
||||
layout.prop(mat, "use_sss_translucency")
|
||||
layout.prop(mat, "pass_index")
|
||||
|
||||
|
||||
def draw_material_volume_settings(layout, mat, is_eevee=True):
|
||||
layout.prop(mat, "volume_intersection_method", text="Intersection" if is_eevee else "Volume Intersection")
|
||||
|
||||
@@ -291,9 +314,12 @@ def draw_material_settings(self, context):
|
||||
|
||||
mat = context.material
|
||||
|
||||
draw_material_surface_settings(layout, mat, False)
|
||||
draw_material_volume_settings(layout, mat, False)
|
||||
|
||||
if context.scene.render.engine == "BLENDER_EEVEE":
|
||||
draw_goo_material_surface_settings(layout, mat)
|
||||
|
||||
else:
|
||||
draw_material_surface_settings(layout, mat, False)
|
||||
draw_material_volume_settings(layout, mat, False)
|
||||
|
||||
class EEVEE_MATERIAL_PT_settings(MaterialButtonsPanel, Panel):
|
||||
bl_label = "Settings"
|
||||
|
||||
@@ -919,6 +919,17 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel):
|
||||
scene = context.scene
|
||||
props = scene.eevee
|
||||
|
||||
col = layout.column()
|
||||
col.operator("scene.light_cache_bake", text="Bake Indirect Lighting", icon='RENDER_STILL')
|
||||
col.operator("scene.light_cache_bake", text="Bake Cubemap Only", icon='LIGHTPROBE_SPHERE').subset = 'CUBEMAPS'
|
||||
col.operator("scene.light_cache_free", text="Delete Lighting Cache")
|
||||
|
||||
cache_info = scene.eevee.gi_cache_info
|
||||
if cache_info:
|
||||
col.label(text=rpt_(cache_info), translate=False)
|
||||
|
||||
col.prop(props, "gi_auto_bake")
|
||||
|
||||
col.prop(props, "gi_diffuse_bounces")
|
||||
col.prop(props, "gi_cubemap_resolution")
|
||||
col.prop(props, "gi_visibility_resolution", text="Diffuse Occlusion")
|
||||
|
||||
@@ -2903,9 +2903,9 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel):
|
||||
({"property": "use_asset_indexing"}, None),
|
||||
({"property": "use_viewport_debug"}, None),
|
||||
({"property": "use_eevee_debug"}, None),
|
||||
({"property": "use_extensions_debug"}, ("/blender/blender/issues/119521", "#119521")),
|
||||
({"property": "disable_material_icon"}, None),
|
||||
({"property": "disable_search_on_keypress"}, None),
|
||||
({"property": "use_extensions_debug"}, ("/blender/blender/issues/119521", "#119521")),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -924,6 +924,8 @@ class VIEW3D_HT_header(Header):
|
||||
row.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
|
||||
row.separator(factor=0.4)
|
||||
row.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE')
|
||||
sub.separator(factor=0.4)
|
||||
sub.prop(tool_settings, "use_gpencil_autoclose_strokes", text="")
|
||||
|
||||
# Select mode for Sculpt
|
||||
if object_mode == 'SCULPT_GPENCIL':
|
||||
@@ -958,8 +960,6 @@ class VIEW3D_HT_header(Header):
|
||||
sub.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
|
||||
sub.separator(factor=0.4)
|
||||
sub.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE')
|
||||
sub.separator(factor=0.4)
|
||||
sub.prop(tool_settings, "use_gpencil_autoclose_strokes", text="")
|
||||
|
||||
# Select mode for Editing
|
||||
if gpd.use_stroke_edit_mode:
|
||||
@@ -4414,7 +4414,7 @@ class VIEW3D_MT_pose_constraints(Menu):
|
||||
layout.operator("pose.constraints_copy")
|
||||
layout.operator("pose.constraints_clear")
|
||||
layout.operator("pose.constraints_merge")
|
||||
|
||||
|
||||
|
||||
class VIEW3D_MT_pose_names(Menu):
|
||||
bl_label = "Names"
|
||||
|
||||
@@ -6,7 +6,6 @@ Light group key management for Goo Engine (EEVEE)
|
||||
|
||||
import bpy
|
||||
from bpy.types import Panel, Material, Light, PropertyGroup, UIList, Operator, ShaderNodeShaderInfo, ShaderNodeTree
|
||||
from bl_ui import UI_UL_list
|
||||
from bpy.props import StringProperty, CollectionProperty, IntProperty, PointerProperty, EnumProperty, BoolProperty
|
||||
from bpy.utils import register_classes_factory
|
||||
from bpy.app.handlers import persistent
|
||||
@@ -174,7 +173,7 @@ class MAT_UL_LightGroupList(UIList):
|
||||
flt_flags = []
|
||||
flt_order = []
|
||||
|
||||
helper_funcs = UI_UL_list
|
||||
helper_funcs = bpy.types.UI_UL_list
|
||||
|
||||
if self.filter_name:
|
||||
flt_flags = helper_funcs.filter_items_by_name(self.filter_name, self.bitflag_filter_item, keys, "name")
|
||||
|
||||
Reference in New Issue
Block a user