Compare commits
8 Commits
version-1.
...
version-1.
Author | SHA1 | Date | |
---|---|---|---|
06126862d4 | |||
7b8713881e | |||
7c65851b75 | |||
ec72091268 | |||
cf7adb065f | |||
74220e4fc4 | |||
0ebd4435e5 | |||
c24501661e |
32
CHANGELOG.md
Normal file
32
CHANGELOG.md
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# Blender Cloud changelog
|
||||||
|
|
||||||
|
## Version 1.6.3 (2017-03-21)
|
||||||
|
|
||||||
|
- Fixed bug where local project path wasn't shown for projects only set up for Flamenco
|
||||||
|
(and not Attract).
|
||||||
|
- Added this CHANGELOG.md file, which will contain user-relevant changes.
|
||||||
|
|
||||||
|
|
||||||
|
## Version 1.6.2 (2017-03-17)
|
||||||
|
|
||||||
|
- Flamenco: when opening non-existing file path, open parent instead - Sybren A. Stüvel
|
||||||
|
- Fix T50954: Improve Blender Cloud add-on project selector
|
||||||
|
|
||||||
|
|
||||||
|
## Version 1.6.1 (2017-03-07)
|
||||||
|
|
||||||
|
- Show error in GUI when Blender Cloud is unreachable
|
||||||
|
- Fixed sample count when using branched path tracing
|
||||||
|
|
||||||
|
|
||||||
|
## Version 1.6.0 (2017-02-14)
|
||||||
|
|
||||||
|
- Default to frame chunk size of 1 (instead of 10).
|
||||||
|
- Turn off "use overwrite" and "use placeholder" for Flamenco blend files.
|
||||||
|
- Fixed bugs when blendfile is outside the project directory
|
||||||
|
|
||||||
|
|
||||||
|
## Older versions
|
||||||
|
|
||||||
|
For the history of older versions, please refer to the
|
||||||
|
[Git history](https://developer.blender.org/diffusion/BCA/)
|
@@ -21,7 +21,7 @@
|
|||||||
bl_info = {
|
bl_info = {
|
||||||
'name': 'Blender Cloud',
|
'name': 'Blender Cloud',
|
||||||
"author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
|
"author": "Sybren A. Stüvel, Francesco Siddi, Inês Almeida, Antony Riakiotakis",
|
||||||
'version': (1, 6, 1),
|
'version': (1, 6, 3),
|
||||||
'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 '
|
||||||
@@ -94,6 +94,8 @@ def register():
|
|||||||
image_sharing.register()
|
image_sharing.register()
|
||||||
attract.register()
|
attract.register()
|
||||||
|
|
||||||
|
blender.handle_project_update()
|
||||||
|
|
||||||
|
|
||||||
def _monkey_patch_requests():
|
def _monkey_patch_requests():
|
||||||
"""Monkey-patch old versions of Requests.
|
"""Monkey-patch old versions of Requests.
|
||||||
|
@@ -60,6 +60,9 @@ from bpy.types import Operator, Panel, AddonPreferences
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Global flag used to determine whether panels etc. can be drawn.
|
||||||
|
attract_is_active = False
|
||||||
|
|
||||||
|
|
||||||
def active_strip(context):
|
def active_strip(context):
|
||||||
try:
|
try:
|
||||||
@@ -139,6 +142,9 @@ def shot_id_use(strips):
|
|||||||
def compute_strip_conflicts(scene):
|
def compute_strip_conflicts(scene):
|
||||||
"""Sets the strip property atc_object_id_conflict for each strip."""
|
"""Sets the strip property atc_object_id_conflict for each strip."""
|
||||||
|
|
||||||
|
if not attract_is_active:
|
||||||
|
return
|
||||||
|
|
||||||
if not scene or not scene.sequence_editor or not scene.sequence_editor.sequences_all:
|
if not scene or not scene.sequence_editor or not scene.sequence_editor.sequences_all:
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -161,7 +167,13 @@ def scene_update_post_handler(scene):
|
|||||||
compute_strip_conflicts(scene)
|
compute_strip_conflicts(scene)
|
||||||
|
|
||||||
|
|
||||||
class ToolsPanel(Panel):
|
class AttractPollMixin:
|
||||||
|
@classmethod
|
||||||
|
def poll(cls, context):
|
||||||
|
return attract_is_active
|
||||||
|
|
||||||
|
|
||||||
|
class ToolsPanel(AttractPollMixin, Panel):
|
||||||
bl_label = 'Attract'
|
bl_label = 'Attract'
|
||||||
bl_space_type = 'SEQUENCE_EDITOR'
|
bl_space_type = 'SEQUENCE_EDITOR'
|
||||||
bl_region_type = 'UI'
|
bl_region_type = 'UI'
|
||||||
@@ -238,7 +250,7 @@ class ToolsPanel(Panel):
|
|||||||
layout.operator(ATTRACT_OT_submit_all.bl_idname)
|
layout.operator(ATTRACT_OT_submit_all.bl_idname)
|
||||||
|
|
||||||
|
|
||||||
class AttractOperatorMixin:
|
class AttractOperatorMixin(AttractPollMixin):
|
||||||
"""Mix-in class for all Attract operators."""
|
"""Mix-in class for all Attract operators."""
|
||||||
|
|
||||||
def _project_needs_setup_error(self):
|
def _project_needs_setup_error(self):
|
||||||
@@ -261,7 +273,7 @@ class AttractOperatorMixin:
|
|||||||
from .. import pillar, blender
|
from .. import pillar, blender
|
||||||
|
|
||||||
prefs = blender.preferences()
|
prefs = blender.preferences()
|
||||||
project = self.find_project(prefs.attract_project.project)
|
project = self.find_project(prefs.project.project)
|
||||||
|
|
||||||
# FIXME: Eve doesn't seem to handle the $elemMatch projection properly,
|
# FIXME: Eve doesn't seem to handle the $elemMatch projection properly,
|
||||||
# even though it works fine in MongoDB itself. As a result, we have to
|
# even though it works fine in MongoDB itself. As a result, we have to
|
||||||
@@ -295,7 +307,7 @@ class AttractOperatorMixin:
|
|||||||
'cut_in_timeline_in_frames': strip.frame_final_start},
|
'cut_in_timeline_in_frames': strip.frame_final_start},
|
||||||
'order': 0,
|
'order': 0,
|
||||||
'node_type': 'attract_shot',
|
'node_type': 'attract_shot',
|
||||||
'project': blender.preferences().attract_project.project,
|
'project': blender.preferences().project.project,
|
||||||
'user': user_uuid}
|
'user': user_uuid}
|
||||||
|
|
||||||
# Create a Node item with the attract API
|
# Create a Node item with the attract API
|
||||||
@@ -373,7 +385,7 @@ class AttractShotFetchUpdate(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return any(selected_shots(context))
|
return AttractOperatorMixin.poll(context) and any(selected_shots(context))
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
for strip in selected_shots(context):
|
for strip in selected_shots(context):
|
||||||
@@ -393,6 +405,9 @@ class AttractShotRelink(AttractShotFetchUpdate):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
|
if not AttractOperatorMixin.poll(context):
|
||||||
|
return False
|
||||||
|
|
||||||
strip = active_strip(context)
|
strip = active_strip(context)
|
||||||
return strip is not None and not getattr(strip, 'atc_object_id', None)
|
return strip is not None and not getattr(strip, 'atc_object_id', None)
|
||||||
|
|
||||||
@@ -433,7 +448,8 @@ class ATTRACT_OT_shot_open_in_browser(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences and active_strip(context))
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(context.selected_sequences and active_strip(context))
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
from ..blender import PILLAR_WEB_SERVER_URL
|
from ..blender import PILLAR_WEB_SERVER_URL
|
||||||
@@ -459,7 +475,8 @@ class AttractShotDelete(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences)
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(context.selected_sequences)
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
from .. import pillar
|
from .. import pillar
|
||||||
@@ -511,7 +528,8 @@ class AttractStripUnlink(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences)
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(context.selected_sequences)
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
unlinked_ids = set()
|
unlinked_ids = set()
|
||||||
@@ -554,7 +572,8 @@ class AttractShotSubmitSelected(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences)
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(context.selected_sequences)
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
# Check that the project is set up for Attract.
|
# Check that the project is set up for Attract.
|
||||||
@@ -610,7 +629,8 @@ class ATTRACT_OT_open_meta_blendfile(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(any(cls.filename_from_metadata(s) for s in context.selected_sequences))
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(any(cls.filename_from_metadata(s) for s in context.selected_sequences))
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def filename_from_metadata(strip):
|
def filename_from_metadata(strip):
|
||||||
@@ -677,7 +697,7 @@ class ATTRACT_OT_make_shot_thumbnail(AttractOperatorMixin,
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences)
|
return AttractOperatorMixin.poll(context) and bool(context.selected_sequences)
|
||||||
|
|
||||||
@contextlib.contextmanager
|
@contextlib.contextmanager
|
||||||
def thumbnail_render_settings(self, context, thumbnail_width=512):
|
def thumbnail_render_settings(self, context, thumbnail_width=512):
|
||||||
@@ -843,7 +863,7 @@ class ATTRACT_OT_make_shot_thumbnail(AttractOperatorMixin,
|
|||||||
from .. import blender
|
from .. import blender
|
||||||
|
|
||||||
prefs = blender.preferences()
|
prefs = blender.preferences()
|
||||||
project = self.find_project(prefs.attract_project.project)
|
project = self.find_project(prefs.project.project)
|
||||||
|
|
||||||
self.log.info('Uploading file %s', filename)
|
self.log.info('Uploading file %s', filename)
|
||||||
resp = await pillar.pillar_call(
|
resp = await pillar.pillar_call(
|
||||||
@@ -873,7 +893,8 @@ class ATTRACT_OT_copy_id_to_clipboard(AttractOperatorMixin, Operator):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def poll(cls, context):
|
def poll(cls, context):
|
||||||
return bool(context.selected_sequences and active_strip(context))
|
return AttractOperatorMixin.poll(context) and \
|
||||||
|
bool(context.selected_sequences and active_strip(context))
|
||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
strip = active_strip(context)
|
strip = active_strip(context)
|
||||||
@@ -905,6 +926,29 @@ def draw_strip_movie_meta(self, context):
|
|||||||
box.label('Original Frame Range: %s-%s' % (sfra, efra))
|
box.label('Original Frame Range: %s-%s' % (sfra, efra))
|
||||||
|
|
||||||
|
|
||||||
|
def activate():
|
||||||
|
global attract_is_active
|
||||||
|
|
||||||
|
log.info('Activating Attract')
|
||||||
|
attract_is_active = True
|
||||||
|
bpy.app.handlers.scene_update_post.append(scene_update_post_handler)
|
||||||
|
draw.callback_enable()
|
||||||
|
|
||||||
|
|
||||||
|
def deactivate():
|
||||||
|
global attract_is_active
|
||||||
|
|
||||||
|
log.info('Deactivating Attract')
|
||||||
|
attract_is_active = False
|
||||||
|
draw.callback_disable()
|
||||||
|
|
||||||
|
try:
|
||||||
|
bpy.app.handlers.scene_update_post.remove(scene_update_post_handler)
|
||||||
|
except ValueError:
|
||||||
|
# This is thrown when scene_update_post_handler does not exist in the handler list.
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
bpy.types.Sequence.atc_is_synced = bpy.props.BoolProperty(name="Is Synced")
|
bpy.types.Sequence.atc_is_synced = bpy.props.BoolProperty(name="Is Synced")
|
||||||
bpy.types.Sequence.atc_object_id = bpy.props.StringProperty(name="Attract Object ID")
|
bpy.types.Sequence.atc_object_id = bpy.props.StringProperty(name="Attract Object ID")
|
||||||
@@ -942,13 +986,9 @@ def register():
|
|||||||
bpy.utils.register_class(ATTRACT_OT_make_shot_thumbnail)
|
bpy.utils.register_class(ATTRACT_OT_make_shot_thumbnail)
|
||||||
bpy.utils.register_class(ATTRACT_OT_copy_id_to_clipboard)
|
bpy.utils.register_class(ATTRACT_OT_copy_id_to_clipboard)
|
||||||
|
|
||||||
bpy.app.handlers.scene_update_post.append(scene_update_post_handler)
|
|
||||||
draw.callback_enable()
|
|
||||||
|
|
||||||
|
|
||||||
def unregister():
|
def unregister():
|
||||||
draw.callback_disable()
|
deactivate()
|
||||||
bpy.app.handlers.scene_update_post.remove(scene_update_post_handler)
|
|
||||||
bpy.utils.unregister_module(__name__)
|
bpy.utils.unregister_module(__name__)
|
||||||
del bpy.types.Sequence.atc_is_synced
|
del bpy.types.Sequence.atc_is_synced
|
||||||
del bpy.types.Sequence.atc_object_id
|
del bpy.types.Sequence.atc_object_id
|
||||||
|
@@ -172,6 +172,11 @@ def callback_disable():
|
|||||||
if not cb_handle:
|
if not cb_handle:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
bpy.types.SpaceSequenceEditor.draw_handler_remove(cb_handle[0], 'WINDOW')
|
bpy.types.SpaceSequenceEditor.draw_handler_remove(cb_handle[0], 'WINDOW')
|
||||||
|
except ValueError:
|
||||||
|
# Thrown when already removed.
|
||||||
|
pass
|
||||||
|
cb_handle.clear()
|
||||||
|
|
||||||
tag_redraw_all_sequencer_editors()
|
tag_redraw_all_sequencer_editors()
|
||||||
|
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
Separated from __init__.py so that we can import & run from non-Blender environments.
|
Separated from __init__.py so that we can import & run from non-Blender environments.
|
||||||
"""
|
"""
|
||||||
|
import functools
|
||||||
import logging
|
import logging
|
||||||
import os.path
|
import os.path
|
||||||
|
|
||||||
@@ -109,13 +109,61 @@ class SyncStatusProperties(PropertyGroup):
|
|||||||
def bcloud_available_projects(self, context):
|
def bcloud_available_projects(self, context):
|
||||||
"""Returns the list of items used by BlenderCloudProjectGroup.project EnumProperty."""
|
"""Returns the list of items used by BlenderCloudProjectGroup.project EnumProperty."""
|
||||||
|
|
||||||
attr_proj = preferences().attract_project
|
projs = preferences().project.available_projects
|
||||||
projs = attr_proj.available_projects
|
|
||||||
if not projs:
|
if not projs:
|
||||||
return [('', 'No projects available in your Blender Cloud', '')]
|
return [('', 'No projects available in your Blender Cloud', '')]
|
||||||
return [(p['_id'], p['name'], '') for p in projs]
|
return [(p['_id'], p['name'], '') for p in projs]
|
||||||
|
|
||||||
|
|
||||||
|
@functools.lru_cache(1)
|
||||||
|
def project_extensions(project_id) -> set:
|
||||||
|
"""Returns the extensions the project is enabled for.
|
||||||
|
|
||||||
|
At the moment of writing these are 'attract' and 'flamenco'.
|
||||||
|
"""
|
||||||
|
|
||||||
|
log.debug('Finding extensions for project %s', project_id)
|
||||||
|
|
||||||
|
# We can't use our @property, since the preferences may be loaded from a
|
||||||
|
# preferences blend file, in which case it is not constructed from Python code.
|
||||||
|
available_projects = preferences().project.get('available_projects', [])
|
||||||
|
if not available_projects:
|
||||||
|
log.debug('No projects available.')
|
||||||
|
return set()
|
||||||
|
|
||||||
|
proj = next((p for p in available_projects
|
||||||
|
if p['_id'] == project_id), None)
|
||||||
|
if proj is None:
|
||||||
|
log.debug('Project %s not found in available projects.', project_id)
|
||||||
|
return set()
|
||||||
|
|
||||||
|
return set(proj.get('enabled_for', ()))
|
||||||
|
|
||||||
|
|
||||||
|
def handle_project_update(_=None, _2=None):
|
||||||
|
"""Handles changing projects, which may cause extensions to be disabled/enabled.
|
||||||
|
|
||||||
|
Ignores arguments so that it can be used as property update callback.
|
||||||
|
"""
|
||||||
|
|
||||||
|
project_id = preferences().project.project
|
||||||
|
log.info('Updating internal state to reflect extensions enabled on current project %s.',
|
||||||
|
project_id)
|
||||||
|
|
||||||
|
project_extensions.cache_clear()
|
||||||
|
|
||||||
|
from blender_cloud import attract, flamenco
|
||||||
|
attract.deactivate()
|
||||||
|
flamenco.deactivate()
|
||||||
|
|
||||||
|
enabled_for = project_extensions(project_id)
|
||||||
|
log.info('Project extensions: %s', enabled_for)
|
||||||
|
if 'attract' in enabled_for:
|
||||||
|
attract.activate()
|
||||||
|
if 'flamenco' in enabled_for:
|
||||||
|
flamenco.activate()
|
||||||
|
|
||||||
|
|
||||||
class BlenderCloudProjectGroup(PropertyGroup):
|
class BlenderCloudProjectGroup(PropertyGroup):
|
||||||
status = EnumProperty(
|
status = EnumProperty(
|
||||||
items=[
|
items=[
|
||||||
@@ -129,7 +177,9 @@ class BlenderCloudProjectGroup(PropertyGroup):
|
|||||||
project = EnumProperty(
|
project = EnumProperty(
|
||||||
items=bcloud_available_projects,
|
items=bcloud_available_projects,
|
||||||
name='Cloud project',
|
name='Cloud project',
|
||||||
description='Which Blender Cloud project to work with')
|
description='Which Blender Cloud project to work with',
|
||||||
|
update=handle_project_update
|
||||||
|
)
|
||||||
|
|
||||||
# List of projects is stored in 'available_projects' ID property,
|
# List of projects is stored in 'available_projects' ID property,
|
||||||
# because I don't know how to store a variable list of strings in a proper RNA property.
|
# because I don't know how to store a variable list of strings in a proper RNA property.
|
||||||
@@ -140,6 +190,7 @@ class BlenderCloudProjectGroup(PropertyGroup):
|
|||||||
@available_projects.setter
|
@available_projects.setter
|
||||||
def available_projects(self, new_projects):
|
def available_projects(self, new_projects):
|
||||||
self['available_projects'] = new_projects
|
self['available_projects'] = new_projects
|
||||||
|
handle_project_update()
|
||||||
|
|
||||||
|
|
||||||
class BlenderCloudPreferences(AddonPreferences):
|
class BlenderCloudPreferences(AddonPreferences):
|
||||||
@@ -165,10 +216,11 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
default=True
|
default=True
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: store local path with the Attract project, so that people
|
# TODO: store project-dependent properties with the project, so that people
|
||||||
# can switch projects and the local path switches with it.
|
# can switch projects and the Attract and Flamenco properties switch with it.
|
||||||
attract_project = PointerProperty(type=BlenderCloudProjectGroup)
|
project = PointerProperty(type=BlenderCloudProjectGroup)
|
||||||
attract_project_local_path = StringProperty(
|
|
||||||
|
cloud_project_local_path = StringProperty(
|
||||||
name='Local Project Path',
|
name='Local Project Path',
|
||||||
description='Local path of your Attract project, used to search for blend files; '
|
description='Local path of your Attract project, used to search for blend files; '
|
||||||
'usually best to set to an absolute path',
|
'usually best to set to an absolute path',
|
||||||
@@ -219,8 +271,8 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
blender_id_profile = None
|
blender_id_profile = None
|
||||||
else:
|
else:
|
||||||
blender_id_profile = blender_id.get_active_profile()
|
blender_id_profile = blender_id.get_active_profile()
|
||||||
|
|
||||||
if blender_id is None:
|
if blender_id is None:
|
||||||
|
|
||||||
msg_icon = 'ERROR'
|
msg_icon = 'ERROR'
|
||||||
text = 'This add-on requires Blender ID'
|
text = 'This add-on requires Blender ID'
|
||||||
help_text = 'Make sure that the Blender ID add-on is installed and activated'
|
help_text = 'Make sure that the Blender ID add-on is installed and activated'
|
||||||
@@ -286,12 +338,16 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
share_box.label('Image Sharing on Blender Cloud', icon_value=icon('CLOUD'))
|
share_box.label('Image Sharing on Blender Cloud', icon_value=icon('CLOUD'))
|
||||||
share_box.prop(self, 'open_browser_after_share')
|
share_box.prop(self, 'open_browser_after_share')
|
||||||
|
|
||||||
# Attract stuff
|
# Project selector
|
||||||
attract_box = layout.box()
|
project_box = layout.box()
|
||||||
self.draw_attract_buttons(attract_box, self.attract_project)
|
project_box.enabled = self.project.status in {'NONE', 'IDLE'}
|
||||||
|
|
||||||
|
self.draw_project_selector(project_box, self.project)
|
||||||
|
extensions = project_extensions(self.project.project)
|
||||||
|
|
||||||
# Flamenco stuff
|
# Flamenco stuff
|
||||||
flamenco_box = layout.box()
|
if 'flamenco' in extensions:
|
||||||
|
flamenco_box = project_box.column()
|
||||||
self.draw_flamenco_buttons(flamenco_box, self.flamenco_manager, context)
|
self.draw_flamenco_buttons(flamenco_box, self.flamenco_manager, context)
|
||||||
|
|
||||||
def draw_subscribe_button(self, layout):
|
def draw_subscribe_button(self, layout):
|
||||||
@@ -328,12 +384,11 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
else:
|
else:
|
||||||
row_pull.label('Cloud Sync is running.')
|
row_pull.label('Cloud Sync is running.')
|
||||||
|
|
||||||
def draw_attract_buttons(self, attract_box, bcp: BlenderCloudProjectGroup):
|
def draw_project_selector(self, project_box, bcp: BlenderCloudProjectGroup):
|
||||||
attract_row = attract_box.row(align=True)
|
project_row = project_box.row(align=True)
|
||||||
attract_row.label('Attract', icon_value=icon('CLOUD'))
|
project_row.label('Project settings', icon_value=icon('CLOUD'))
|
||||||
|
|
||||||
attract_row.enabled = bcp.status in {'NONE', 'IDLE'}
|
row_buttons = project_row.row(align=True)
|
||||||
row_buttons = attract_row.row(align=True)
|
|
||||||
|
|
||||||
projects = bcp.available_projects
|
projects = bcp.available_projects
|
||||||
project = bcp.project
|
project = bcp.project
|
||||||
@@ -350,27 +405,39 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
else:
|
else:
|
||||||
row_buttons.label('Fetching available projects.')
|
row_buttons.label('Fetching available projects.')
|
||||||
|
|
||||||
attract_box.prop(self, 'attract_project_local_path')
|
enabled_for = project_extensions(project)
|
||||||
|
if not project:
|
||||||
|
return
|
||||||
|
|
||||||
|
if not enabled_for:
|
||||||
|
project_box.label('This project is not set up for Attract or Flamenco')
|
||||||
|
return
|
||||||
|
|
||||||
|
project_box.label('This project is set up for: %s' %
|
||||||
|
', '.join(sorted(enabled_for)))
|
||||||
|
|
||||||
|
# This is only needed when the project is set up for either Attract or Flamenco.
|
||||||
|
project_box.prop(self, 'cloud_project_local_path',
|
||||||
|
text='Local Cloud project path')
|
||||||
|
|
||||||
def draw_flamenco_buttons(self, flamenco_box, bcp: flamenco.FlamencoManagerGroup, context):
|
def draw_flamenco_buttons(self, flamenco_box, bcp: flamenco.FlamencoManagerGroup, context):
|
||||||
flamenco_row = flamenco_box.row(align=True)
|
header_row = flamenco_box.row(align=True)
|
||||||
flamenco_row.label('Flamenco', icon_value=icon('CLOUD'))
|
header_row.label('Flamenco:', icon_value=icon('CLOUD'))
|
||||||
|
|
||||||
flamenco_row.enabled = bcp.status in {'NONE', 'IDLE'}
|
manager_box = flamenco_box.row(align=True)
|
||||||
row_buttons = flamenco_row.row(align=True)
|
|
||||||
|
|
||||||
if bcp.status in {'NONE', 'IDLE'}:
|
if bcp.status in {'NONE', 'IDLE'}:
|
||||||
if not bcp.available_managers or not bcp.manager:
|
if not bcp.available_managers or not bcp.manager:
|
||||||
row_buttons.operator('flamenco.managers',
|
manager_box.operator('flamenco.managers',
|
||||||
text='Find Flamenco Managers',
|
text='Find Flamenco Managers',
|
||||||
icon='FILE_REFRESH')
|
icon='FILE_REFRESH')
|
||||||
else:
|
else:
|
||||||
row_buttons.prop(bcp, 'manager', text='Manager')
|
manager_box.prop(bcp, 'manager', text='Manager')
|
||||||
row_buttons.operator('flamenco.managers',
|
manager_box.operator('flamenco.managers',
|
||||||
text='',
|
text='',
|
||||||
icon='FILE_REFRESH')
|
icon='FILE_REFRESH')
|
||||||
else:
|
else:
|
||||||
row_buttons.label('Fetching available managers.')
|
manager_box.label('Fetching available managers.')
|
||||||
|
|
||||||
path_box = flamenco_box.row(align=True)
|
path_box = flamenco_box.row(align=True)
|
||||||
path_box.prop(self, 'flamenco_job_file_path')
|
path_box.prop(self, 'flamenco_job_file_path')
|
||||||
@@ -400,11 +467,6 @@ class BlenderCloudPreferences(AddonPreferences):
|
|||||||
|
|
||||||
flamenco_box.prop(self, 'flamenco_open_browser_after_submit')
|
flamenco_box.prop(self, 'flamenco_open_browser_after_submit')
|
||||||
|
|
||||||
# TODO: make a reusable way to select projects, and use that for Attract and Flamenco.
|
|
||||||
note_box = flamenco_box.column(align=True)
|
|
||||||
note_box.label('NOTE: For now, Flamenco uses the same project as Attract.')
|
|
||||||
note_box.label('This will change in a future version of the add-on.')
|
|
||||||
|
|
||||||
|
|
||||||
class PillarCredentialsUpdate(pillar.PillarOperatorMixin,
|
class PillarCredentialsUpdate(pillar.PillarOperatorMixin,
|
||||||
Operator):
|
Operator):
|
||||||
@@ -488,7 +550,7 @@ class PILLAR_OT_projects(async_loop.AsyncModalOperatorMixin,
|
|||||||
|
|
||||||
self.log.info('Going to fetch projects for user %s', self.user_id)
|
self.log.info('Going to fetch projects for user %s', self.user_id)
|
||||||
|
|
||||||
preferences().attract_project.status = 'FETCHING'
|
preferences().project.status = 'FETCHING'
|
||||||
|
|
||||||
# Get all projects, except the home project.
|
# Get all projects, except the home project.
|
||||||
projects_user = await pillar_call(
|
projects_user = await pillar_call(
|
||||||
@@ -497,7 +559,8 @@ class PILLAR_OT_projects(async_loop.AsyncModalOperatorMixin,
|
|||||||
'category': {'$ne': 'home'}},
|
'category': {'$ne': 'home'}},
|
||||||
'sort': '-_created',
|
'sort': '-_created',
|
||||||
'projection': {'_id': True,
|
'projection': {'_id': True,
|
||||||
'name': True},
|
'name': True,
|
||||||
|
'extension_props': True},
|
||||||
})
|
})
|
||||||
|
|
||||||
projects_shared = await pillar_call(
|
projects_shared = await pillar_call(
|
||||||
@@ -506,20 +569,34 @@ class PILLAR_OT_projects(async_loop.AsyncModalOperatorMixin,
|
|||||||
'permissions.groups.group': {'$in': self.db_user.groups}},
|
'permissions.groups.group': {'$in': self.db_user.groups}},
|
||||||
'sort': '-_created',
|
'sort': '-_created',
|
||||||
'projection': {'_id': True,
|
'projection': {'_id': True,
|
||||||
'name': True},
|
'name': True,
|
||||||
|
'extension_props': True},
|
||||||
})
|
})
|
||||||
|
|
||||||
# We need to convert to regular dicts before storing in ID properties.
|
# We need to convert to regular dicts before storing in ID properties.
|
||||||
# Also don't store more properties than we need.
|
# Also don't store more properties than we need.
|
||||||
projects = [{'_id': p['_id'], 'name': p['name']} for p in projects_user['_items']] + \
|
def reduce_properties(project_list):
|
||||||
[{'_id': p['_id'], 'name': p['name']} for p in projects_shared['_items']]
|
for p in project_list:
|
||||||
|
p = p.to_dict()
|
||||||
|
extension_props = p.get('extension_props', {})
|
||||||
|
enabled_for = list(extension_props.keys())
|
||||||
|
|
||||||
preferences().attract_project.available_projects = projects
|
self._log.debug('Project %r is enabled for %s', p['name'], enabled_for)
|
||||||
|
yield {
|
||||||
|
'_id': p['_id'],
|
||||||
|
'name': p['name'],
|
||||||
|
'enabled_for': enabled_for,
|
||||||
|
}
|
||||||
|
|
||||||
|
projects = list(reduce_properties(projects_user['_items'])) + \
|
||||||
|
list(reduce_properties(projects_shared['_items']))
|
||||||
|
|
||||||
|
preferences().project.available_projects = projects
|
||||||
|
|
||||||
self.quit()
|
self.quit()
|
||||||
|
|
||||||
def quit(self):
|
def quit(self):
|
||||||
preferences().attract_project.status = 'IDLE'
|
preferences().project.status = 'IDLE'
|
||||||
super().quit()
|
super().quit()
|
||||||
|
|
||||||
|
|
||||||
|
@@ -34,6 +34,9 @@ from ..utils import pyside_cache, redraw
|
|||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Global flag used to determine whether panels etc. can be drawn.
|
||||||
|
flamenco_is_active = False
|
||||||
|
|
||||||
|
|
||||||
@pyside_cache('manager')
|
@pyside_cache('manager')
|
||||||
def available_managers(self, context):
|
def available_managers(self, context):
|
||||||
@@ -73,8 +76,15 @@ class FlamencoManagerGroup(PropertyGroup):
|
|||||||
self['available_managers'] = new_managers
|
self['available_managers'] = new_managers
|
||||||
|
|
||||||
|
|
||||||
|
class FlamencoPollMixin:
|
||||||
|
@classmethod
|
||||||
|
def poll(cls, context):
|
||||||
|
return flamenco_is_active
|
||||||
|
|
||||||
|
|
||||||
class FLAMENCO_OT_fmanagers(async_loop.AsyncModalOperatorMixin,
|
class FLAMENCO_OT_fmanagers(async_loop.AsyncModalOperatorMixin,
|
||||||
pillar.AuthenticatedPillarOperatorMixin,
|
pillar.AuthenticatedPillarOperatorMixin,
|
||||||
|
FlamencoPollMixin,
|
||||||
Operator):
|
Operator):
|
||||||
"""Fetches the Flamenco Managers available to the user"""
|
"""Fetches the Flamenco Managers available to the user"""
|
||||||
bl_idname = 'flamenco.managers'
|
bl_idname = 'flamenco.managers'
|
||||||
@@ -115,6 +125,7 @@ class FLAMENCO_OT_fmanagers(async_loop.AsyncModalOperatorMixin,
|
|||||||
|
|
||||||
class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
|
class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
|
||||||
pillar.AuthenticatedPillarOperatorMixin,
|
pillar.AuthenticatedPillarOperatorMixin,
|
||||||
|
FlamencoPollMixin,
|
||||||
Operator):
|
Operator):
|
||||||
"""Performs a Blender render on Flamenco."""
|
"""Performs a Blender render on Flamenco."""
|
||||||
bl_idname = 'flamenco.render'
|
bl_idname = 'flamenco.render'
|
||||||
@@ -176,7 +187,7 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
job_info = await create_job(self.user_id,
|
job_info = await create_job(self.user_id,
|
||||||
prefs.attract_project.project,
|
prefs.project.project,
|
||||||
prefs.flamenco_manager.manager,
|
prefs.flamenco_manager.manager,
|
||||||
scene.flamenco_render_job_type,
|
scene.flamenco_render_job_type,
|
||||||
settings,
|
settings,
|
||||||
@@ -308,7 +319,7 @@ class FLAMENCO_OT_render(async_loop.AsyncModalOperatorMixin,
|
|||||||
return outfile, missing_sources
|
return outfile, missing_sources
|
||||||
|
|
||||||
|
|
||||||
class FLAMENCO_OT_scene_to_frame_range(Operator):
|
class FLAMENCO_OT_scene_to_frame_range(FlamencoPollMixin, Operator):
|
||||||
"""Sets the scene frame range as the Flamenco render frame range."""
|
"""Sets the scene frame range as the Flamenco render frame range."""
|
||||||
bl_idname = 'flamenco.scene_to_frame_range'
|
bl_idname = 'flamenco.scene_to_frame_range'
|
||||||
bl_label = 'Sets the scene frame range as the Flamenco render frame range'
|
bl_label = 'Sets the scene frame range as the Flamenco render frame range'
|
||||||
@@ -321,6 +332,7 @@ class FLAMENCO_OT_scene_to_frame_range(Operator):
|
|||||||
|
|
||||||
|
|
||||||
class FLAMENCO_OT_copy_files(Operator,
|
class FLAMENCO_OT_copy_files(Operator,
|
||||||
|
FlamencoPollMixin,
|
||||||
async_loop.AsyncModalOperatorMixin):
|
async_loop.AsyncModalOperatorMixin):
|
||||||
"""Uses BAM to copy the current blendfile + dependencies to the target directory."""
|
"""Uses BAM to copy the current blendfile + dependencies to the target directory."""
|
||||||
bl_idname = 'flamenco.copy_files'
|
bl_idname = 'flamenco.copy_files'
|
||||||
@@ -352,8 +364,13 @@ class FLAMENCO_OT_copy_files(Operator,
|
|||||||
bpy.context.window_manager.flamenco_status = 'IDLE'
|
bpy.context.window_manager.flamenco_status = 'IDLE'
|
||||||
|
|
||||||
|
|
||||||
class FLAMENCO_OT_explore_file_path(Operator):
|
class FLAMENCO_OT_explore_file_path(FlamencoPollMixin,
|
||||||
"""Opens the Flamenco job storage path in a file explorer."""
|
Operator):
|
||||||
|
"""Opens the Flamenco job storage path in a file explorer.
|
||||||
|
|
||||||
|
If the path cannot be found, this operator tries to open its parent.
|
||||||
|
"""
|
||||||
|
|
||||||
bl_idname = 'flamenco.explore_file_path'
|
bl_idname = 'flamenco.explore_file_path'
|
||||||
bl_label = 'Open in file explorer'
|
bl_label = 'Open in file explorer'
|
||||||
bl_description = __doc__.rstrip('.')
|
bl_description = __doc__.rstrip('.')
|
||||||
@@ -362,15 +379,30 @@ class FLAMENCO_OT_explore_file_path(Operator):
|
|||||||
|
|
||||||
def execute(self, context):
|
def execute(self, context):
|
||||||
import platform
|
import platform
|
||||||
import subprocess
|
import pathlib
|
||||||
import os
|
|
||||||
|
# Possibly open a parent of the path
|
||||||
|
to_open = pathlib.Path(self.path)
|
||||||
|
while to_open.parent != to_open: # while we're not at the root
|
||||||
|
if to_open.exists():
|
||||||
|
break
|
||||||
|
to_open = to_open.parent
|
||||||
|
else:
|
||||||
|
self.report({'ERROR'}, 'Unable to open %s or any of its parents.' % self.path)
|
||||||
|
return {'CANCELLED'}
|
||||||
|
to_open = str(to_open)
|
||||||
|
|
||||||
if platform.system() == "Windows":
|
if platform.system() == "Windows":
|
||||||
os.startfile(self.path)
|
import os
|
||||||
|
os.startfile(to_open)
|
||||||
|
|
||||||
elif platform.system() == "Darwin":
|
elif platform.system() == "Darwin":
|
||||||
subprocess.Popen(["open", self.path])
|
import subprocess
|
||||||
|
subprocess.Popen(["open", to_open])
|
||||||
|
|
||||||
else:
|
else:
|
||||||
subprocess.Popen(["xdg-open", self.path])
|
import subprocess
|
||||||
|
subprocess.Popen(["xdg-open", to_open])
|
||||||
|
|
||||||
return {'FINISHED'}
|
return {'FINISHED'}
|
||||||
|
|
||||||
@@ -482,7 +514,7 @@ def render_output_path(context, filepath: Path = None) -> typing.Optional[PurePa
|
|||||||
filepath = Path(context.blend_data.filepath)
|
filepath = Path(context.blend_data.filepath)
|
||||||
|
|
||||||
return _render_output_path(
|
return _render_output_path(
|
||||||
prefs.attract_project_local_path,
|
prefs.cloud_project_local_path,
|
||||||
filepath,
|
filepath,
|
||||||
prefs.flamenco_job_output_strip_components,
|
prefs.flamenco_job_output_strip_components,
|
||||||
prefs.flamenco_job_output_path,
|
prefs.flamenco_job_output_path,
|
||||||
@@ -491,7 +523,7 @@ def render_output_path(context, filepath: Path = None) -> typing.Optional[PurePa
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class FLAMENCO_PT_render(bpy.types.Panel):
|
class FLAMENCO_PT_render(bpy.types.Panel, FlamencoPollMixin):
|
||||||
bl_label = "Flamenco Render"
|
bl_label = "Flamenco Render"
|
||||||
bl_space_type = 'PROPERTIES'
|
bl_space_type = 'PROPERTIES'
|
||||||
bl_region_type = 'WINDOW'
|
bl_region_type = 'WINDOW'
|
||||||
@@ -556,6 +588,22 @@ class FLAMENCO_PT_render(bpy.types.Panel):
|
|||||||
layout.label('Unknown Flamenco status %s' % flamenco_status)
|
layout.label('Unknown Flamenco status %s' % flamenco_status)
|
||||||
|
|
||||||
|
|
||||||
|
def activate():
|
||||||
|
"""Activates draw callbacks, menu items etc. for Flamenco."""
|
||||||
|
|
||||||
|
global flamenco_is_active
|
||||||
|
log.info('Activating Flamenco')
|
||||||
|
flamenco_is_active = True
|
||||||
|
|
||||||
|
|
||||||
|
def deactivate():
|
||||||
|
"""Deactivates draw callbacks, menu items etc. for Flamenco."""
|
||||||
|
|
||||||
|
global flamenco_is_active
|
||||||
|
log.info('Deactivating Flamenco')
|
||||||
|
flamenco_is_active = False
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
from ..utils import redraw
|
from ..utils import redraw
|
||||||
|
|
||||||
@@ -615,6 +663,7 @@ def register():
|
|||||||
|
|
||||||
|
|
||||||
def unregister():
|
def unregister():
|
||||||
|
deactivate()
|
||||||
bpy.utils.unregister_module(__name__)
|
bpy.utils.unregister_module(__name__)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
2
setup.py
2
setup.py
@@ -227,7 +227,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.6.1',
|
version='1.6.3',
|
||||||
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('.'),
|
||||||
|
@@ -1,15 +1,19 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
VERSION="${1/version-}"
|
||||||
|
|
||||||
|
if [ -z "$VERSION" ]; then
|
||||||
echo "Usage: $0 new-version" >&2
|
echo "Usage: $0 new-version" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BL_INFO_VER=$(echo "$1" | sed 's/\./, /g')
|
BL_INFO_VER=$(echo "$VERSION" | sed 's/\./, /g')
|
||||||
|
|
||||||
sed "s/version='[^']*'/version='$1'/" -i setup.py
|
sed "s/version='[^']*'/version='$VERSION'/" -i setup.py
|
||||||
sed "s/'version': ([^)]*)/'version': ($BL_INFO_VER)/" -i blender_cloud/__init__.py
|
sed "s/'version': ([^)]*)/'version': ($BL_INFO_VER)/" -i blender_cloud/__init__.py
|
||||||
|
|
||||||
git diff
|
git diff
|
||||||
echo
|
echo
|
||||||
echo "Don't forget to commit!"
|
echo "Don't forget to commit and tag:"
|
||||||
|
echo git commit -m \'Bumped version to $VERSION\' setup.py blender_cloud/__init__.py
|
||||||
|
echo git tag -a version-$VERSION -m \'Tagged version $VERSION\'
|
||||||
|
Reference in New Issue
Block a user