studio/blender-studio-tools
13
32
Fork 19
Code Issues 21 Pull Requests 4 Projects Releases 1 Activity

SVN: UX improvements #136

Merged
Demeter Dzadik merged 15 commits from Mets/blender-studio-pipeline:svn_ux_improvements into main 2023-08-01 15:39:18 +02:00
Conversation 0 Commits 15 Files Changed 20 +5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b881cffd91 - Show all commits

3
scripts-blender/addons/blender_svn/operators/svn_update.py
View File

@ -44,11 +44,14 @@ class SVN_OT_update_all(May_Modifiy_Current_Blend, Operator):
current_blend = repo.current_blend_file current_blend = repo.current_blend_file
if self.revision == 0: if self.revision == 0:
if current_blend and current_blend.repos_status != 'none': if current_blend and current_blend.repos_status != 'none':
# If the current file will be modified, warn user.
self.file_rel_path = current_blend.svn_path self.file_rel_path = current_blend.svn_path
return context.window_manager.invoke_props_dialog(self, width=500) return context.window_manager.invoke_props_dialog(self, width=500)
else: else:
for f in repo.external_files: for f in repo.external_files:
if f.status in ['modified', 'added', 'conflicted', 'deleted', 'missing', 'unversioned']: if f.status in ['modified', 'added', 'conflicted', 'deleted', 'missing', 'unversioned']:
# If user wants to check out an older version of the repo but
# there are uncommitted local changes to any files, warn user.
return context.window_manager.invoke_props_dialog(self, width=500) return context.window_manager.invoke_props_dialog(self, width=500)
return self.execute(context) return self.execute(context)

2
scripts-blender/addons/blender_svn/threaded/background_process.py
View File

@ -239,6 +239,8 @@ class ProcessManager:
process = self.processes.get(proc_name, None) process = self.processes.get(proc_name, None)
if process: if process:
process.start() process.start()
for key, value in kwargs.items():
setattr(process, key, value)
return return
else: else:
for subcl in get_recursive_subclasses(BackgroundProcess): for subcl in get_recursive_subclasses(BackgroundProcess):