studio/blender-studio-pipeline
13
30
Fork 19
Code Issues 18 Pull Requests 4 Projects Releases 1 Activity

Blender SVN: New Features #273

Open
Demeter Dzadik wants to merge 13 commits from New-SVN-features into main
pull from: New-SVN-features
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 13 Files Changed 12 +15
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c6ad7e5e6 - Show all commits

12
scripts-blender/addons/blender_svn/operators/simple_commands.py
View File

@ -528,6 +528,17 @@ class SVN_OT_cleanup(SVN_Operator, Operator):
return {"FINISHED"} return {"FINISHED"}
class SVN_OT_cancel_running_operation(Operator):
bl_idname = "svn.cancel"
bl_label = "SVN Cancel Operation"
bl_description = "Cancel the running operation"
bl_options = {'INTERNAL'}
def execute(self, context):
Processes.kill('Commit')
Processes.kill('Update')
return {'FINISHED'}
registry = [ registry = [
SVN_OT_update_single, SVN_OT_update_single,
SVN_OT_revert_and_update, SVN_OT_revert_and_update,
@ -541,4 +552,5 @@ registry = [
SVN_OT_resolve_conflict, SVN_OT_resolve_conflict,
SVN_OT_set_directory_depth, SVN_OT_set_directory_depth,
SVN_OT_cleanup, SVN_OT_cleanup,
SVN_OT_cancel_running_operation,
] ]

3
scripts-blender/addons/blender_svn/ui/ui_file_list.py
View File

@ -227,6 +227,9 @@ def draw_file_list(context, layout):
if not prefs.do_auto_updates: if not prefs.do_auto_updates:
col.operator("svn.update_all", icon='IMPORT', text="").revision = 0 col.operator("svn.update_all", icon='IMPORT', text="").revision = 0
if prefs.is_busy:
col.operator('svn.cancel', text="", icon="X")
col.separator() col.separator()
col.operator("svn.cleanup", icon='BRUSH_DATA', text="") col.operator("svn.cleanup", icon='BRUSH_DATA', text="")