Compare commits

..

5 Commits

5 changed files with 22 additions and 8 deletions

View File

@@ -24,6 +24,8 @@ Installing the addon
* If you don't have one already, sign up for an account at * If you don't have one already, sign up for an account at
the [Blender ID site](https://www.blender.org/id/). the [Blender ID site](https://www.blender.org/id/).
* If you had a previous version of the addon installed, deactivate it
and restart Blender.
* Install and log in with the * Install and log in with the
[Blender ID addon](https://developer.blender.org/diffusion/BIA/). [Blender ID addon](https://developer.blender.org/diffusion/BIA/).
* Install the Blender Cloud addon in Blender (User Preferences → * Install the Blender Cloud addon in Blender (User Preferences →

View File

@@ -21,7 +21,7 @@
bl_info = { bl_info = {
'name': 'Blender Cloud', 'name': 'Blender Cloud',
'author': 'Sybren A. Stüvel and Francesco Siddi', 'author': 'Sybren A. Stüvel and Francesco Siddi',
'version': (1, 2, 0), 'version': (1, 2, 1),
'blender': (2, 77, 0), 'blender': (2, 77, 0),
'location': 'Addon Preferences panel, and Ctrl+Shift+Alt+A anywhere for texture browser', 'location': 'Addon Preferences panel, and Ctrl+Shift+Alt+A anywhere for texture browser',
'description': 'Texture library browser and Blender Sync. Requires the Blender ID addon ' 'description': 'Texture library browser and Blender Sync. Requires the Blender ID addon '

View File

@@ -26,7 +26,7 @@ def blender_syncable_versions(self, context):
bss = context.window_manager.blender_sync_status bss = context.window_manager.blender_sync_status
versions = bss.available_blender_versions versions = bss.available_blender_versions
if not versions: if not versions:
return [('', 'No settings stored in your home project.', '')] return [('', 'No settings stored in your Blender Cloud', '')]
return [(v, v, '') for v in versions] return [(v, v, '') for v in versions]

View File

@@ -21,13 +21,22 @@ from . import async_loop, pillar, cache, blendfile
SETTINGS_FILES_TO_UPLOAD = ['userpref.blend', 'startup.blend'] SETTINGS_FILES_TO_UPLOAD = ['userpref.blend', 'startup.blend']
# These are RNA keys inside the userpref.blend file, and their # These are RNA keys inside the userpref.blend file, and their
# Python properties names. # Python properties names. These settings will not be synced.
LOCAL_SETTINGS_RNA = [ LOCAL_SETTINGS_RNA = [
(b'dpi', 'system.dpi'), (b'dpi', 'system.dpi'),
(b'virtual_pixel', 'system.virtual_pixel_mode'), (b'virtual_pixel', 'system.virtual_pixel_mode'),
(b'compute_device_id', 'system.compute_device'), (b'compute_device_id', 'system.compute_device'),
(b'compute_device_type', 'system.compute_device_type'), (b'compute_device_type', 'system.compute_device_type'),
(b'fontdir', 'filepaths.font_directory'),
(b'textudir', 'filepaths.texture_directory'),
(b'renderdir', 'filepaths.render_output_directory'),
(b'pythondir', 'filepaths.script_directory'),
(b'sounddir', 'filepaths.sound_directory'),
(b'tempdir', 'filepaths.temporary_directory'), (b'tempdir', 'filepaths.temporary_directory'),
(b'render_cachedir', 'filepaths.render_cache_directory'),
(b'i18ndir', 'filepaths.i18n_branches_directory'),
(b'image_editor', 'filepaths.image_editor'),
(b'anim_player', 'filepaths.animation_player'),
] ]
REQUIRES_ROLES_FOR_SYNC = set() # no roles needed. REQUIRES_ROLES_FOR_SYNC = set() # no roles needed.
@@ -241,7 +250,7 @@ async def available_blender_versions(home_project_id: str, user_id: str) -> list
caching=False) caching=False)
if sync_group is None: if sync_group is None:
bss.report({'ERROR'}, 'No synced Blender settings in your home project') bss.report({'ERROR'}, 'No synced Blender settings in your Blender Cloud')
log.debug('-- unable to find sync group for home_project_id=%r and user_id=%r', log.debug('-- unable to find sync group for home_project_id=%r and user_id=%r',
home_project_id, user_id) home_project_id, user_id)
return [] return []
@@ -259,7 +268,7 @@ async def available_blender_versions(home_project_id: str, user_id: str) -> list
caching=False) caching=False)
if not sync_nodes or not sync_nodes._items: if not sync_nodes or not sync_nodes._items:
bss.report({'ERROR'}, 'No synced Blender settings in your home project') bss.report({'ERROR'}, 'No synced Blender settings in your Blender Cloud.')
return [] return []
versions = [node.name for node in sync_nodes._items] versions = [node.name for node in sync_nodes._items]
@@ -455,7 +464,8 @@ class PILLAR_OT_sync(pillar.PillarOperatorMixin,
# If the sync group node doesn't exist, offer a list of groups that do. # If the sync group node doesn't exist, offer a list of groups that do.
if self.sync_group_id is None: if self.sync_group_id is None:
self.bss_report({'ERROR'}, 'There are no synced Blender settings in your home project.') self.bss_report({'ERROR'},
'There are no synced Blender settings in your Blender Cloud.')
return return
if self.sync_group_versioned_id is None: if self.sync_group_versioned_id is None:

View File

@@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python3
import glob import glob
import sys import sys
import shutil import shutil
@@ -14,6 +15,7 @@ from distutils.command.install_egg_info import install_egg_info
from setuptools import setup, find_packages from setuptools import setup, find_packages
requirement_re = re.compile('[><=]+') requirement_re = re.compile('[><=]+')
sys.dont_write_bytecode = True
def set_default_path(var, default): def set_default_path(var, default):
@@ -177,7 +179,7 @@ setup(
'wheels': BuildWheels}, 'wheels': BuildWheels},
name='blender_cloud', name='blender_cloud',
description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.', description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
version='1.2.0', version='1.2.1',
author='Sybren A. Stüvel', author='Sybren A. Stüvel',
author_email='sybren@stuvel.eu', author_email='sybren@stuvel.eu',
packages=find_packages('.'), packages=find_packages('.'),