Compare commits

..

7 Commits

6 changed files with 8 additions and 7 deletions

3
.gitignore vendored
View File

@@ -1,7 +1,6 @@
*.pyc
*.swp
*.blend
*.blend[1-9]
/*.blend*
blender_cloud/wheels/*.whl
/textures*/
/test_*.py

View File

@@ -22,6 +22,9 @@ cd $(dirname $(readlink -f $0))
BCLOUD=$(ls ../dist/blender_cloud-*.addon.zip | tail -n 1)
BID=$(ls ../../../blender-id-addon/dist/blender_id-*.addon.zip | tail -n 1)
[ -z "$BCLOUD" ] && echo "BCloud addon not found" >&2
[ -z "$BID" ] && echo "B'ID addon not found" >&2
cp -va $BCLOUD $BID .
BUNDLE=$(basename $BCLOUD)

View File

@@ -21,7 +21,7 @@
bl_info = {
'name': 'Blender Cloud',
'author': 'Sybren A. Stüvel and Francesco Siddi',
'version': (1, 4, 0),
'version': (1, 4, 2),
'blender': (2, 77, 0),
'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 '
@@ -29,7 +29,6 @@ bl_info = {
'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'
'Scripts/System/BlenderCloud',
'category': 'System',
'support': 'OFFICIAL'
}
import logging

View File

@@ -256,7 +256,7 @@ async def refresh_pillar_credentials(required_roles: set):
import blender_id
from . import blender
pillar_endpoint = blender.preferences().pillar_server.rstrip('/')
pillar_endpoint = blender.preferences().pillar_server
# Create a subclient token and send it to Pillar.
# May raise a blender_id.BlenderIdCommError

View File

@@ -445,7 +445,7 @@ class PILLAR_OT_sync(pillar.PillarOperatorMixin,
self.log.info('Unable to find node on Blender Cloud for %s', fname)
return
async def file_downloaded(file_path: str, file_desc: pillarsdk.File):
async def file_downloaded(file_path: str, file_desc: pillarsdk.File, map_type: str):
# Allow the caller to adjust the file before we move it into place.
if fname.lower() == 'userpref.blend':

View File

@@ -196,7 +196,7 @@ setup(
'wheels': BuildWheels},
name='blender_cloud',
description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
version='1.4.0',
version='1.4.2',
author='Sybren A. Stüvel',
author_email='sybren@stuvel.eu',
packages=find_packages('.'),