diff options
| author | Julian Eisel <julian@blender.org> | 2021-03-24 14:15:46 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-03-24 14:22:57 +0300 |
| commit | fd6015f9fdb3e3d59a3149098464e82145a1c74c (patch) | |
| tree | c3af9a6e883edbd40791149ca4b9481e18bb49e7 /source/blender/blenloader/intern/versioning_290.c | |
| parent | 12d7b71294acf5f5c3ea8f6b463641d938d71816 (diff) | |
| parent | 26b45448abf05dc709678cb821201b0721a51d76 (diff) | |
Merge branch 'master' into ui-asset-view-template
Diffstat (limited to 'source/blender/blenloader/intern/versioning_290.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_290.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index bc01d328370..ac06886b3c9 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -36,6 +36,7 @@ #include "DNA_gpencil_modifier_types.h" #include "DNA_gpencil_types.h" #include "DNA_hair_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -103,7 +104,7 @@ static eSpaceSeq_Proxy_RenderSize get_sequencer_render_size(Main *bmain) return render_size; } -static bool can_use_proxy(Sequence *seq, int psize) +static bool can_use_proxy(const Sequence *seq, int psize) { if (seq->strip->proxy == NULL) { return false; @@ -1916,6 +1917,13 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) */ { /* Keep this block, even when empty. */ + + if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "diff_fac")) { + LISTBASE_FOREACH (Light *, light, &bmain->lights) { + light->diff_fac = 1.0f; + light->volume_fac = 1.0f; + } + } } { |