Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-07-15 12:53:57 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-07-15 17:38:59 +0300
commit8a5a8282ce48704e60e70cb02d747aede71e70b8 (patch)
treec5a593adc18d7e9edc80f98916eb2c441c2c0d13 /release/scripts
parent70d193203bbac53a6c2992fbb5f87f4aa8465bb4 (diff)
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
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/modules/bl_previews_utils/bl_previews_render.py2
1 files changed, 1 insertions, 1 deletions
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