diff --git a/MolecularNodes/assets/node_append_file.blend b/MolecularNodes/assets/node_append_file.blend index 9c564ea8..0f44a21e 100644 Binary files a/MolecularNodes/assets/node_append_file.blend and b/MolecularNodes/assets/node_append_file.blend differ diff --git a/MolecularNodes/nodes.py b/MolecularNodes/nodes.py index 59b474cb..d106f0ab 100644 --- a/MolecularNodes/nodes.py +++ b/MolecularNodes/nodes.py @@ -230,14 +230,6 @@ def create_starting_node_tree(obj, coll_frames, starting_style = "atoms"): node_group = gn_new_group_empty("MOL_" + str(obj.name)) node_mod.node_group = node_group - # TODO check if can delete this loop - # ensure the required setup nodes either already exist or append them - # required_setup_nodes = ['MOL_prop_setup', 'MOL_style_color'] - # if n_frames > 1: - # required_setup_nodes = ['MOL_prop_setup', 'MOL_style_color', 'MOL_animate', 'MOL_animate_frames'] - # for node_group in required_setup_nodes: - # mol_append_node(node_group) - # move the input and output nodes for the group node_input = node_mod.node_group.nodes[bpy.app.translations.pgettext_data("Group Input",)] node_input.location = [0, 0] @@ -245,7 +237,7 @@ def create_starting_node_tree(obj, coll_frames, starting_style = "atoms"): node_output.location = [800, 0] # node_properties = add_custom_node_group(node_group, 'MOL_prop_setup', [0, 0]) - node_colour = add_custom_node_group(node_mod, 'MOL_style_color', [200, 0]) + node_colour = add_custom_node_group(node_mod, 'MOL_color_set_common', [200, 0]) node_random_colour = node_group.nodes.new("FunctionNodeRandomValue") node_random_colour.data_type = 'FLOAT_VECTOR' diff --git a/MolecularNodes/ui.py b/MolecularNodes/ui.py index bf547fc3..dcc108f1 100644 --- a/MolecularNodes/ui.py +++ b/MolecularNodes/ui.py @@ -786,6 +786,9 @@ def draw(self, context): layout.operator_context = "INVOKE_DEFAULT" menu_item_interface(layout, 'Set Color', 'MOL_color_set', "Sets a new color for the selected atoms") + menu_item_interface(layout, 'Set Color Common', 'MOL_color_set_common', + "Choose a color for the most common elements in PDB \ + structures") layout.separator() menu_item_interface(layout, 'Goodsell Colors', 'MOL_color_goodsell', "Adjusts the given colors to copy the 'Goodsell Style'.\n \ @@ -800,9 +803,6 @@ def draw(self, context): menu_item_interface(layout, 'Color by Element', 'MOL_color_element', "Choose a color for each of the first 20 elements") menu_item_color_chains(layout, 'Color by Chains') - menu_item_interface(layout, 'Color Atomic', 'MOL_style_color', - "Choose a color for the most common elements in PDB \ - structures") class MOL_MT_Add_Node_Menu_Bonds(bpy.types.Menu): bl_idname = 'MOL_MT_ADD_NODE_MENU_BONDS'