Compare commits
4 Commits
version-1.
...
version-1.
Author | SHA1 | Date | |
---|---|---|---|
9272e22129 | |||
e14a0aa53c | |||
51cf097c8f | |||
4608204f1d |
@@ -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, 5, 999),
|
'version': (1, 5, 9999),
|
||||||
'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 '
|
||||||
|
@@ -371,7 +371,6 @@ def _render_output_path(
|
|||||||
try:
|
try:
|
||||||
proj_rel = blendfile.parent.relative_to(project_path)
|
proj_rel = blendfile.parent.relative_to(project_path)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
log.exception('Current file is outside of project path %s', project_path)
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
rel_parts = proj_rel.parts[flamenco_job_output_strip_components:]
|
rel_parts = proj_rel.parts[flamenco_job_output_strip_components:]
|
||||||
@@ -445,6 +444,9 @@ class FLAMENCO_PT_render(bpy.types.Panel):
|
|||||||
labeled_row.label('Output:')
|
labeled_row.label('Output:')
|
||||||
prop_btn_row = labeled_row.row(align=True)
|
prop_btn_row = labeled_row.row(align=True)
|
||||||
render_output = render_output_path(context)
|
render_output = render_output_path(context)
|
||||||
|
if render_output is None:
|
||||||
|
prop_btn_row.label('Unable to render with Flamenco, outside of project directory.')
|
||||||
|
else:
|
||||||
prop_btn_row.label(str(render_output))
|
prop_btn_row.label(str(render_output))
|
||||||
props = prop_btn_row.operator(FLAMENCO_OT_explore_file_path.bl_idname,
|
props = prop_btn_row.operator(FLAMENCO_OT_explore_file_path.bl_idname,
|
||||||
text='', icon='DISK_DRIVE')
|
text='', icon='DISK_DRIVE')
|
||||||
@@ -454,6 +456,11 @@ class FLAMENCO_PT_render(bpy.types.Panel):
|
|||||||
text='Render on Flamenco',
|
text='Render on Flamenco',
|
||||||
icon='RENDER_ANIMATION')
|
icon='RENDER_ANIMATION')
|
||||||
|
|
||||||
|
if not context.scene.render.use_overwrite:
|
||||||
|
warnbox = layout.box().column(align=True)
|
||||||
|
warnbox.label('Please enable "Overwrite" in the Output panel,')
|
||||||
|
warnbox.label('or re-queueing this job might not do anything.')
|
||||||
|
|
||||||
|
|
||||||
def register():
|
def register():
|
||||||
bpy.utils.register_class(FlamencoManagerGroup)
|
bpy.utils.register_class(FlamencoManagerGroup)
|
||||||
|
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.5.999',
|
version='1.5.9999',
|
||||||
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