Compare commits
5 Commits
version-1.
...
version-1.
Author | SHA1 | Date | |
---|---|---|---|
38a3bcba71 | |||
2cf400a74c | |||
54ebb0bf5d | |||
9e84d2a416 | |||
772e6b0b1b |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,7 +1,6 @@
|
|||||||
*.pyc
|
*.pyc
|
||||||
*.swp
|
*.swp
|
||||||
*.blend
|
/*.blend*
|
||||||
*.blend[1-9]
|
|
||||||
blender_cloud/wheels/*.whl
|
blender_cloud/wheels/*.whl
|
||||||
/textures*/
|
/textures*/
|
||||||
/test_*.py
|
/test_*.py
|
||||||
|
@@ -22,6 +22,9 @@ cd $(dirname $(readlink -f $0))
|
|||||||
BCLOUD=$(ls ../dist/blender_cloud-*.addon.zip | tail -n 1)
|
BCLOUD=$(ls ../dist/blender_cloud-*.addon.zip | tail -n 1)
|
||||||
BID=$(ls ../../../blender-id-addon/dist/blender_id-*.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 .
|
cp -va $BCLOUD $BID .
|
||||||
|
|
||||||
BUNDLE=$(basename $BCLOUD)
|
BUNDLE=$(basename $BCLOUD)
|
||||||
|
@@ -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, 4, 1),
|
'version': (1, 4, 2),
|
||||||
'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 '
|
||||||
@@ -29,7 +29,6 @@ bl_info = {
|
|||||||
'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'
|
'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/'
|
||||||
'Scripts/System/BlenderCloud',
|
'Scripts/System/BlenderCloud',
|
||||||
'category': 'System',
|
'category': 'System',
|
||||||
'support': 'OFFICIAL'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
@@ -256,7 +256,7 @@ async def refresh_pillar_credentials(required_roles: set):
|
|||||||
import blender_id
|
import blender_id
|
||||||
|
|
||||||
from . import blender
|
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.
|
# Create a subclient token and send it to Pillar.
|
||||||
# May raise a blender_id.BlenderIdCommError
|
# May raise a blender_id.BlenderIdCommError
|
||||||
|
2
setup.py
2
setup.py
@@ -196,7 +196,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.4.1',
|
version='1.4.2',
|
||||||
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('.'),
|
||||||
|
Reference in New Issue
Block a user