From 7465212cf09787728476305853214618d1f1b4c7 Mon Sep 17 00:00:00 2001 From: Insality Date: Thu, 10 Mar 2022 20:00:33 +0200 Subject: [PATCH] Don't process layouting node inside templates --- editor_scripts/create_druid_component.py | 6 +++++- editor_scripts/create_druid_component.sh | 5 +++-- editor_scripts/setup_layers.sh | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/editor_scripts/create_druid_component.py b/editor_scripts/create_druid_component.py index 4a59fd8..08a4982 100644 --- a/editor_scripts/create_druid_component.py +++ b/editor_scripts/create_druid_component.py @@ -103,7 +103,11 @@ def main(): for node in root.iter_elements("nodes"): node_name = node.get_attribute("id").value scheme_list.append("\t" + get_id(node_name) + " = \"" + node_name + "\"") - process_component(node_name, component_name) + + is_template = node.get_attribute("template") + is_in_template = "/" in node_name + if not is_template and not is_in_template: + process_component(node_name, component_name) if len(component_define) > 2: component_define = "\n" + component_define diff --git a/editor_scripts/create_druid_component.sh b/editor_scripts/create_druid_component.sh index a5e1162..56e44f1 100644 --- a/editor_scripts/create_druid_component.sh +++ b/editor_scripts/create_druid_component.sh @@ -7,8 +7,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" is_defree_installed=$(pip3 list --disable-pip-version-check | grep -E "deftree") if [ -z "$is_defree_installed" ]; then - echo "The python deftree is not installed. Installing..." - pip3 install deftree + echo "The python deftree is not installed. Please install it via" + echo "pip3 install deftree" + exit 0 fi python3 $DIR/create_druid_component.py $@ diff --git a/editor_scripts/setup_layers.sh b/editor_scripts/setup_layers.sh index 8863eef..96a4617 100755 --- a/editor_scripts/setup_layers.sh +++ b/editor_scripts/setup_layers.sh @@ -7,8 +7,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" is_defree_installed=$(pip3 list --disable-pip-version-check | grep -E "deftree") if [ -z "$is_defree_installed" ]; then - echo "The python deftree is not installed. Installing..." - pip3 install deftree + echo "The python deftree is not installed. Please install it via" + echo "pip3 install deftree" + exit 0 fi python3 $DIR/setup_layers.py $@