diff options
Diffstat (limited to 'io_scene_gltf2/blender/com')
| -rwxr-xr-x | io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py | 20 | ||||
| -rw-r--r-- | io_scene_gltf2/blender/com/gltf2_blender_ui.py | 34 |
2 files changed, 4 insertions, 50 deletions
diff --git a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py index 7dfef7dc..4f8417e9 100755 --- a/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_material_helpers.py @@ -17,21 +17,9 @@ def create_settings_group(name): thicknessFactor.default_value = 0.0 gltf_node_group.nodes.new('NodeGroupOutput') gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') - gltf_node_group_input.location = -200, 0 - return gltf_node_group - -def get_gltf_pbr_non_converted_name(): - return "original glTF PBR data" - -def create_gltf_pbr_non_converted_group(name): - gltf_node_group = bpy.data.node_groups.new(name, 'ShaderNodeTree') - - specular = gltf_node_group.inputs.new("NodeSocketFloat", "specular glTF") + specular = gltf_node_group.inputs.new("NodeSocketFloat", "Specular") specular.default_value = 1.0 - specularColor = gltf_node_group.inputs.new("NodeSocketColor", "specularColor glTF") + specularColor = gltf_node_group.inputs.new("NodeSocketColor", "Specular Color") specularColor.default_value = [1.0,1.0,1.0,1.0] - - gltf_node_group.nodes.new('NodeGroupOutput') - gltf_node_group_input = gltf_node_group.nodes.new('NodeGroupInput') - gltf_node_group_input.location = -400, 0 - return gltf_node_group
\ No newline at end of file + gltf_node_group_input.location = -200, 0 + return gltf_node_group diff --git a/io_scene_gltf2/blender/com/gltf2_blender_ui.py b/io_scene_gltf2/blender/com/gltf2_blender_ui.py index 2f24c081..406a15f1 100644 --- a/io_scene_gltf2/blender/com/gltf2_blender_ui.py +++ b/io_scene_gltf2/blender/com/gltf2_blender_ui.py @@ -3,7 +3,6 @@ import bpy from ..com.gltf2_blender_material_helpers import get_gltf_node_name, create_settings_group -from ..com.gltf2_blender_material_helpers import get_gltf_pbr_non_converted_name, create_gltf_pbr_non_converted_group ################ glTF Material Output node ########################################### @@ -43,36 +42,6 @@ def add_gltf_settings_to_menu(self, context) : if bpy.context.preferences.addons['io_scene_gltf2'].preferences.settings_node_ui is True: self.layout.operator("node.gltf_settings_node_operator") -class NODE_OT_GLTF_PBR_NON_CONVERTED_EXTENSIONS(bpy.types.Operator): - bl_idname = "node.gltf_pbr_non_converted_extensions_operator" - bl_label = "glTF Original PBR data" - bl_description = "Add a node to the active tree for glTF export" - - @classmethod - def poll(cls, context): - space = context.space_data - return space.type == "NODE_EDITOR" \ - and context.object and context.object.active_material \ - and context.object.active_material.use_nodes is True \ - and bpy.context.preferences.addons['io_scene_gltf2'].preferences.settings_node_ui is True - - def execute(self, context): - gltf_node_name = get_gltf_pbr_non_converted_name() - if gltf_node_name in bpy.data.node_groups: - my_group = bpy.data.node_groups[get_gltf_pbr_non_converted_name()] - else: - my_group = create_gltf_pbr_non_converted_group(gltf_node_name) - node_tree = context.object.active_material.node_tree - new_node = node_tree.nodes.new("ShaderNodeGroup") - new_node.node_tree = bpy.data.node_groups[my_group.name] - return {"FINISHED"} - - -def add_gltf_pbr_non_converted_extensions_to_menu(self, context) : - if bpy.context.preferences.addons['io_scene_gltf2'].preferences.settings_node_ui is True: - self.layout.operator("node.gltf_pbr_non_converted_extensions_operator") - - ################################### KHR_materials_variants #################### # Global UI panel @@ -469,9 +438,7 @@ class SCENE_OT_gltf2_remove_material_variant(bpy.types.Operator): def register(): bpy.utils.register_class(NODE_OT_GLTF_SETTINGS) - bpy.utils.register_class(NODE_OT_GLTF_PBR_NON_CONVERTED_EXTENSIONS) bpy.types.NODE_MT_category_SH_NEW_OUTPUT.append(add_gltf_settings_to_menu) - bpy.types.NODE_MT_category_SH_NEW_OUTPUT.append(add_gltf_pbr_non_converted_extensions_to_menu) def variant_register(): bpy.utils.register_class(SCENE_OT_gltf2_display_variant) @@ -499,7 +466,6 @@ def variant_register(): def unregister(): bpy.utils.unregister_class(NODE_OT_GLTF_SETTINGS) - bpy.utils.unregister_class(NODE_OT_GLTF_PBR_NON_CONVERTED_EXTENSIONS) def variant_unregister(): bpy.utils.unregister_class(SCENE_OT_gltf2_variant_add) |