Bladeren bron

Merge branch 'fix/empty-mantis-tree-execution' into 'master'

Fix empty Mantis tree execution loop

See merge request josephbburg/mantis!5
josephbburg 1 week geleden
bovenliggende
commit
232494be09
2 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 1 1
      __init__.py
  2. 3 1
      base_definitions.py

+ 1 - 1
__init__.py

@@ -273,8 +273,8 @@ def execute_handler(scene):
             # check here instead of in execute_tree because these  values can be
             #  modified at weird times and checking from the handler is more consistent
             if ( node_tree.tree_valid) and ( node_tree.do_live_update ):
-                node_tree.execute_tree(context)
                 node_tree.tree_valid=False
+                node_tree.execute_tree(context)
 
 from .versioning import versioning_tasks
 def node_version_update(node, do_once):

+ 3 - 1
base_definitions.py

@@ -315,7 +315,7 @@ class MantisTree(NodeTree):
                 self.parsed_tree = readtree.parse_tree(self, error_popups)
                 if context:
                     self.display_update(context)
-                self.tree_valid = True
+                self.tree_valid = bool(self.parsed_tree)
             except Exception as e:
                 prRed("Failed to update node tree due to error.")
                 self.tree_valid = False
@@ -352,6 +352,8 @@ class MantisTree(NodeTree):
         self.prevent_next_exec = False
         if not self.hash_recursive:
             return
+        if not self.parsed_tree:
+            return
         if self.is_exporting or self.is_executing:
             return
         prGreen("Executing Tree: %s" % self.name)