Compare commits
6 Commits
version-1.
...
version-1.
Author | SHA1 | Date | |
---|---|---|---|
5a2c528681 | |||
53b12376d1 | |||
8495868ea6 | |||
cf810de41b | |||
c457767edf | |||
985b3f6a7d |
@@ -6,6 +6,7 @@
|
||||
- Flamenco: Support for Flamenco Manager settings versioning + for settings version 2.
|
||||
When using Blender Cloud Add-on 1.12 or older, Flamenco Server will automatically convert the
|
||||
Manager settings to version 1.
|
||||
- More Blender 2.80 compatibility fixes
|
||||
|
||||
|
||||
## Version 1.12 (2019-03-25)
|
||||
|
@@ -21,7 +21,7 @@
|
||||
bl_info = {
|
||||
'name': 'Blender Cloud',
|
||||
"author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
|
||||
'version': (1, 13, 3),
|
||||
'version': (1, 13, 4),
|
||||
'blender': (2, 80, 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 '
|
||||
|
@@ -63,6 +63,7 @@ from pillarsdk.projects import Project
|
||||
from pillarsdk import exceptions as sdk_exceptions
|
||||
|
||||
from bpy.types import Operator, Panel, AddonPreferences
|
||||
import bl_ui.space_sequencer
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -946,25 +947,31 @@ class ATTRACT_OT_project_open_in_browser(Operator):
|
||||
return {'FINISHED'}
|
||||
|
||||
|
||||
def draw_strip_movie_meta(self, context):
|
||||
strip = active_strip(context)
|
||||
if not strip:
|
||||
return
|
||||
class ATTRACT_PT_strip_metadata(bl_ui.space_sequencer.SequencerButtonsPanel, Panel):
|
||||
bl_label = "Metadata"
|
||||
bl_parent_id = "SEQUENCER_PT_info"
|
||||
bl_category = "Strip"
|
||||
bl_options = {'DEFAULT_CLOSED'}
|
||||
|
||||
meta = strip.get('metadata', None)
|
||||
if not meta:
|
||||
return None
|
||||
def draw(self, context):
|
||||
strip = active_strip(context)
|
||||
if not strip:
|
||||
return
|
||||
|
||||
box = self.layout.column(align=True)
|
||||
row = box.row(align=True)
|
||||
fname = meta.get('BLEND_FILE', None) or None
|
||||
if fname:
|
||||
row.label(text='Original Blendfile: %s' % fname)
|
||||
row.operator(ATTRACT_OT_open_meta_blendfile.bl_idname,
|
||||
text='', icon='FILE_BLEND')
|
||||
sfra = meta.get('START_FRAME', '?')
|
||||
efra = meta.get('END_FRAME', '?')
|
||||
box.label(text='Original Frame Range: %s-%s' % (sfra, efra))
|
||||
meta = strip.get('metadata', None)
|
||||
if not meta:
|
||||
return None
|
||||
|
||||
box = self.layout.column(align=True)
|
||||
row = box.row(align=True)
|
||||
fname = meta.get('BLEND_FILE', None) or None
|
||||
if fname:
|
||||
row.label(text='Original Blendfile: %s' % fname)
|
||||
row.operator(ATTRACT_OT_open_meta_blendfile.bl_idname,
|
||||
text='', icon='FILE_BLEND')
|
||||
sfra = meta.get('START_FRAME', '?')
|
||||
efra = meta.get('END_FRAME', '?')
|
||||
box.label(text='Original Frame Range: %s-%s' % (sfra, efra))
|
||||
|
||||
|
||||
def activate():
|
||||
@@ -1023,13 +1030,6 @@ def register():
|
||||
name="Status")
|
||||
bpy.types.Sequence.atc_order = bpy.props.IntProperty(name="Order")
|
||||
|
||||
try:
|
||||
panel = bpy.types.SEQUENCER_PT_info_input
|
||||
except AttributeError:
|
||||
# Blender 2.79 and older:
|
||||
panel = bpy.types.SEQUENCER_PT_edit
|
||||
panel.append(draw_strip_movie_meta)
|
||||
|
||||
for cls in _rna_classes:
|
||||
bpy.utils.register_class(cls)
|
||||
|
||||
|
6
setup.py
6
setup.py
@@ -123,8 +123,8 @@ class BuildWheels(Command):
|
||||
"""Downloads a wheel from PyPI and saves it in self.wheels_path."""
|
||||
|
||||
subprocess.check_call([
|
||||
'pip', 'download',
|
||||
'--no-deps',
|
||||
sys.executable, '-m', 'pip',
|
||||
'download', '--no-deps',
|
||||
'--dest', str(self.wheels_path),
|
||||
requirement[0]
|
||||
])
|
||||
@@ -236,7 +236,7 @@ setup(
|
||||
'wheels': BuildWheels},
|
||||
name='blender_cloud',
|
||||
description='The Blender Cloud addon allows browsing the Blender Cloud from Blender.',
|
||||
version='1.13.3',
|
||||
version='1.13.4',
|
||||
author='Sybren A. Stüvel',
|
||||
author_email='sybren@stuvel.eu',
|
||||
packages=find_packages('.'),
|
||||
|
Reference in New Issue
Block a user