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 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a41384c13c - Show all commits

10
scripts-blender/addons/blender_svn/prefs.py
View File

@ -159,15 +159,15 @@ class SVN_addon_preferences(AddonPreferences):
repo = self.repositories.add() repo = self.repositories.add()
repo.directory = directory repo.directory = directory
for key, value in repo_data.items(): for key, value in repo_data.items():
if key == 'custom_directory_depths': setattr(repo, key, value)
if 'custom_directory_depths' in repo_data:
for dir_path, depth in repo_data['custom_directory_depths'].items(): for dir_path, depth in repo_data['custom_directory_depths'].items():
dir_entry = self.external_files.get(dir_path) dir_entry = repo.external_files.get(dir_path)
if not dir_entry: if not dir_entry:
dir_entry = self.external_files.add() dir_entry = repo.external_files.add()
dir_entry.svn_path = dir_path dir_entry.svn_path = dir_path
dir_entry.depth = depth dir_entry.depth = depth
else:
setattr(repo, key, value)
finally: finally:
self.loading = False self.loading = False