diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:25:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-29 22:29:20 +0300 |
| commit | 3984586292855bb6710facf5845b44f5d11dcc6f (patch) | |
| tree | c649e5d521ad4f9012276fcf0175f4e75db22bb7 /source/blender/blenloader/intern/versioning_280.c | |
| parent | 35c6d68d35699fe088537074ebaa5034c8e6321e (diff) | |
| parent | e4faed120d9c294ea5d6061b3213ed4f6784db52 (diff) | |
Merge branch 'blender-v2.82-release'
Merge conflict in source/blender/gpu/GPU_texture.h
Diffstat (limited to 'source/blender/blenloader/intern/versioning_280.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 7377f6a62a1..e92ae6e73cc 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -4411,8 +4411,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } /* Pose brush IK segments. */ - if (!DNA_struct_elem_find(fd->filesdna, "Brush", "int", "pose_ik_segments")) { - for (Brush *br = bmain->brushes.first; br; br = br->id.next) { + for (Brush *br = bmain->brushes.first; br; br = br->id.next) { + if (br->pose_ik_segments == 0) { br->pose_ik_segments = 1; } } |