diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-11-04 06:51:50 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-04 06:51:50 +0300 |
| commit | 682f1548beba26472f31434096597a7caa0edd82 (patch) | |
| tree | ec6491fe026935365dc581b132790928ade3f8d5 /source/blender | |
| parent | c0fdaf700a51cf15281abfb21488513f37504f75 (diff) | |
| parent | 915f911daacd972beeb004d0f27fb290bb9e8c08 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_cycles.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c index 3df6af86618..afe2e1067ae 100644 --- a/source/blender/blenloader/intern/versioning_cycles.c +++ b/source/blender/blenloader/intern/versioning_cycles.c @@ -1635,6 +1635,8 @@ void do_versions_after_linking_cycles(Main *bmain) flag |= OB_HIDE_CAMERA | OB_SHADOW_CATCHER; } + /* Clear unused bits from old version, and add new flags. */ + object->visibility_flag &= (OB_HIDE_VIEWPORT | OB_HIDE_SELECT | OB_HIDE_RENDER); object->visibility_flag |= flag; } } |