Skip to content

Commit

Permalink
Merge branch 'master' into logging-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke Pflibsen-Jones committed Aug 6, 2021
2 parents 09786a5 + 35a8156 commit 9517723
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ class TreeGenRender(bpy.types.Operator):
bl_idname = "object.tree_gen_render_tree"
bl_category = "TreeGen"
bl_label = "Render Tree"
bl_options = {'REGISTER'}
bl_options = {'REGISTER', 'UNDO'}

def execute(self, context):
utilities.render_tree(context.scene.render_output_path_input)
Expand All @@ -308,7 +308,7 @@ class TreeGenConvertToMesh(bpy.types.Operator):
bl_idname = "object.tree_gen_convert_to_mesh"
bl_category = "TreeGen"
bl_label = "Convert To Mesh"
bl_options = {'REGISTER'}
bl_options = {'REGISTER', 'UNDO'}

def execute(self, context):
from . import utilities
Expand Down Expand Up @@ -336,7 +336,7 @@ class TreeGenCreateLODs(bpy.types.Operator):
bl_idname = "object.tree_gen_create_lods"
bl_category = "TreeGen"
bl_label = "Create LODs"
bl_options = {'REGISTER'}
bl_options = {'REGISTER', 'UNDO'}

def execute(self, context):
from . import utilities
Expand Down Expand Up @@ -364,7 +364,7 @@ class TreeGenSaveFile(bpy.types.Operator):
bl_idname = "object.tree_gen_custom_save"
bl_category = "TreeGen"
bl_label = "Save Custom Tree"
bl_options = {'REGISTER'}
bl_options = {'REGISTER', 'UNDO'}

def execute(self, context):
save_location = context.scene.custom_tree_save_location_input
Expand Down Expand Up @@ -392,7 +392,7 @@ class TreeGenLoadParams(bpy.types.Operator):
bl_idname = "object.tree_gen_custom_load"
bl_category = "TreeGen"
bl_label = "Load Tree Parameters"
bl_options = {'REGISTER'}
bl_options = {'REGISTER', 'UNDO'}

def execute(self, context):
mod_name = context.scene.custom_tree_load_params_input
Expand Down Expand Up @@ -430,6 +430,7 @@ class TreeGenMainThreadExecuter(bpy.types.Operator):

bl_idname = 'object.treegen_main_thread_executer'
bl_label = 'TreeGen internal executer utility'
bl_options = {'REGISTER', 'UNDO'}

_updating = False
_calcs_done = False
Expand Down

0 comments on commit 9517723

Please sign in to comment.