Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-03 06:58:34 +02:00
parent e856eb7e8b 8c15d612a5
commit 00fc1d70a7
56 changed files with 757 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bl_previews_utils/bl_previews_render.py
View File

@@ -442,7 +442,7 @@ def do_previews(do_objects, do_collections, do_scenes, do_data_intern):
if not has_camera:
# We had to add a temp camera, now we need to place it to see interesting objects!
objects = tuple((ob.name, ob.library.filepath if ob.library else None) for ob in scene.objects
if (not ob.hide_render) and (ob.type in OBJECT_TYPES_RENDER))
if (not ob.hide_render) and (ob.type in OBJECT_TYPES_RENDER))
preview_render_do(render_context, 'scenes', scene.name, objects)