[Bf-blender-cvs] [8a5a8282ce4] master: Fix T64827 (part two): "Batch-Generate Previews" fails with certain files
Philipp Oeser
noreply at git.blender.org
Mon Jul 15 16:40:03 CEST 2019
Commit: 8a5a8282ce48704e60e70cb02d747aede71e70b8
Author: Philipp Oeser
Date: Mon Jul 15 11:53:57 2019 +0200
Branches: master
https://developer.blender.org/rB8a5a8282ce48704e60e70cb02d747aede71e70b8
Fix T64827 (part two): "Batch-Generate Previews" fails with certain files
Some values (not properly handled by do_versions?) could cause
'rna_backup_restore()' to throw an error resulting in the whole preview
generation not being saved to the .blend file.
I've checked folowwing demo files:
- race_spaceship.blend
- wasp_bot.blend
Here the offending seetings were:
- `UnitSettings` (`length_unit`, ...)
- `FFmpegSettings` (`ffmpeg_preset`, ...)
For now, these are now excluded in `exclude_props`
Reviewers: brecht
Differential Revision: https://developer.blender.org/D5255
===================================================================
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
===================================================================
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index 8d1a782bc54..124b8de8eaf 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -83,7 +83,7 @@ def do_previews(do_objects, do_collections, do_scenes, do_data_intern):
if engine == '__SCENE':
backup_scene, backup_world, backup_camera, backup_light, backup_camera_data, backup_light_data = [()] * 6
scene = bpy.context.window.scene
- exclude_props = {('world',), ('camera',), ('tool_settings',), ('preview',)}
+ exclude_props = {('world',), ('camera',), ('tool_settings',), ('preview',), ('render','ffmpeg'), ('unit_settings',)}
backup_scene = tuple(rna_backup_gen(scene, exclude_props=exclude_props))
world = scene.world
camera = scene.camera
More information about the Bf-blender-cvs
mailing list