Commit: db211c8eddd7d2c2b28c7874a7582c1651bc19e9
Author: YimingWu
Date: Thu Jun 25 17:26:49 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBdb211c8eddd7d2c2b28c7874a7582c1651bc19e9
LANPR: Version bumper moved to latest.
===================================================================
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index 6d74627851c..55ba271fe44 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4431,19 +4431,6 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
ToolSettings *ts = scene->toolsettings;
UnifiedPaintSettings *ups = &ts->unified_paint_settings;
ups->flag &= ~(UNIFIED_PAINT_FLAG_UNUSED_0 |
UNIFIED_PAINT_FLAG_UNUSED_1);
-
- if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
- for (Scene *scene = bmain->scenes.first; scene; scene =
scene->id.next) {
-
- scene->lanpr.crease_threshold = 0.7;
-
- scene->lanpr.flags |= (LANPR_USE_INTERSECTIONS);
-
- zero_v4(scene->lanpr.line_color);
-
- scene->lanpr.line_color[3] = 1;
- }
- }
}
/* Set the default render pass in the viewport to Combined. */
@@ -5115,6 +5102,21 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
}
}
+ for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+ if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
+ for (Scene *scene = bmain->scenes.first; scene; scene =
scene->id.next) {
+
+ scene->lanpr.crease_threshold = 0.7;
+
+ scene->lanpr.flags |= (LANPR_USE_INTERSECTIONS);
+
+ zero_v4(scene->lanpr.line_color);
+
+ scene->lanpr.line_color[3] = 1;
+ }
+ }
+ }
+
/* Keep this block, even when empty. */
}
}
\ No newline at end of file
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
