archive/blender-cloud-addon
Archived
1
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent overwriting of certain user preferences.

Browse Source 
Those prefs are considered system-specific, such as the temporary
directory and CUDA compute device.
This commit is contained in:
Sybren A. Stüvel 2016-06-17 16:47:32 +02:00
parent 56137c485f
commit 9c527520a9
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
blender_cloud/settings_sync.py
View File

@ -18,6 +18,12 @@ from .pillar import pillar_call
from . import async_loop, pillar, cache from . import async_loop, pillar, cache
SETTINGS_FILES_TO_UPLOAD = ['bookmarks.txt', 'recent-files.txt', 'userpref.blend', 'startup.blend'] SETTINGS_FILES_TO_UPLOAD = ['bookmarks.txt', 'recent-files.txt', 'userpref.blend', 'startup.blend']
LOCAL_SETTINGS = [
'system.dpi',
'system.virtual_pixel_mode',
'system.compute_device',
'filepaths.temporary_directory',
]
HOME_PROJECT_ENDPOINT = '/bcloud/home-project' HOME_PROJECT_ENDPOINT = '/bcloud/home-project'
SYNC_GROUP_NODE_NAME = 'Blender Sync' SYNC_GROUP_NODE_NAME = 'Blender Sync'
@ -226,6 +232,21 @@ class PILLAR_OT_sync(async_loop.AsyncModalOperatorMixin, bpy.types.Operator):
async def reload_after_pull(self): async def reload_after_pull(self):
self.report({'WARNING'}, 'Settings pulled from Blender Cloud, reloading.') self.report({'WARNING'}, 'Settings pulled from Blender Cloud, reloading.')
from pprint import pprint
# Remember some settings that should not be overwritten.
up = bpy.context.user_preferences
remembered = {}
for key in LOCAL_SETTINGS:
try:
value = up.path_resolve(key)
except ValueError:
# Setting doesn't exist. This can happen, for example Cycles
# settings on a build that doesn't have Cycles enabled.
continue
remembered[key] = value
print('REMEMBERED:')
pprint(remembered)
# This call is tricy, as Blender destroys this modal operator's StructRNA. # This call is tricy, as Blender destroys this modal operator's StructRNA.
# However, the Python code keeps running, so we have to be very careful # However, the Python code keeps running, so we have to be very careful
@ -233,6 +254,18 @@ class PILLAR_OT_sync(async_loop.AsyncModalOperatorMixin, bpy.types.Operator):
log.warning('Reloading home files (i.e. userprefs and startup)') log.warning('Reloading home files (i.e. userprefs and startup)')
bpy.ops.wm.read_homefile() bpy.ops.wm.read_homefile()
# Restore those settings again.
up = bpy.context.user_preferences
for key, value in remembered.items():
if '.' in key:
last_dot = key.rindex('.')
parent, key = key[:last_dot], key[last_dot+1:]
set_on = up.path_resolve(parent)
else:
set_on = up
print('RESTORING: %s.%s=%s' % (set_on, key, value))
setattr(set_on, key, value)
# The above call stops any running modal operator, so we have to be # The above call stops any running modal operator, so we have to be
# very careful with our asynchronous loop. Since it didn't stop by # very careful with our asynchronous loop. Since it didn't stop by
# its own accord (because the current async task is still running), # its own accord (because the current async task is still running),