Merge branch 'master' into blender2.8

[blender.git] / source / blender / blenloader / intern / versioning_270.c

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index d6f0754544992712d53d30732301406735b168c9..d631e1507e34bc2dfcf1bd9c4754174d02d82bc2 100644 (file)
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1107,9 +1107,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                                }
                        }
                }
-       }
 
-       {
                for (Camera *camera = main->camera.first; camera != NULL; camera = camera->id.next) {
                        if (camera->stereo.pole_merge_angle_from == 0.0f &&
                            camera->stereo.pole_merge_angle_to == 0.0f)
@@ -1118,5 +1116,19 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
                                camera->stereo.pole_merge_angle_to = DEG2RAD(75.0f);
                        }
                }
+
+               if (!DNA_struct_elem_find(fd->filesdna, "NormalEditModifierData", "float", "mix_limit")) {
+                       Object *ob;
+
+                       for (ob = main->object.first; ob; ob = ob->id.next) {
+                               ModifierData *md;
+                               for (md = ob->modifiers.first; md; md = md->next) {
+                                       if (md->type == eModifierType_NormalEdit) {
+                                               NormalEditModifierData *nemd = (NormalEditModifierData *)md;
+                                               nemd->mix_limit = DEG2RADF(180.0f);
+                                       }
+                               }
+                       }
+               }
        }
 }