Commit: e1edb516994f88e1c1c03ec9f68d0bb0815ba6be
Author: Campbell Barton
Date: Fri Feb 8 09:39:54 2019 +1100
Branches: master
https://developer.blender.org/rBe1edb516994f88e1c1c03ec9f68d0bb0815ba6be
Correct error in last commit
===================================================================
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index 92e908ad522..554361ef813 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2798,16 +2798,16 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *bmain)
enum {
R_ALPHAKEY = 2,
};
- scene->rd.seq_flag &= ~(
+ scene->r.seq_flag &= ~(
R_SEQ_DEPRECATED_0 |
R_SEQ_DEPRECATED_1 |
R_SEQ_DEPRECATED_2);
- scene->rd.color_mgt_flag &=
~R_COLOR_MANAGEMENT_DEPRECATED_1;
- if (scene->rd.alphamode == R_ALPHAKEY) {
- scene->rd.alphamode = R_ADDSKY;
+ scene->r.color_mgt_flag &=
~R_COLOR_MANAGEMENT_DEPRECATED_1;
+ if (scene->r.alphamode == R_ALPHAKEY) {
+ scene->r.alphamode = R_ADDSKY;
}
ToolSettings *ts = scene->toolsettings;
- ts->particle &= ~PE_DEPRECATED_6;
+ ts->particle.flag &= ~PE_DEPRECATED_6;
ts->sculpt->flags &= ~SCULPT_FLAG_DEPRECATED_6;
}
}
diff --git a/source/blender/blenloader/intern/versioning_userdef.c
b/source/blender/blenloader/intern/versioning_userdef.c
index f3443d36540..4db3fe76b0f 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -469,8 +469,8 @@ void BLO_version_defaults_userpref_blend(Main *bmain,
UserDef *userdef)
}
if (!USER_VERSION_ATLEAST(280, 44)) {
- userdef->flag &= ~(
- USER_FLAG_DEPRECATED_0 | USER_FLAG_DEPRECATED_1);
+ userdef->uiflag &= ~(
+ USER_UIFLAG_DEPRECATED_0 | USER_UIFLAG_DEPRECATED_1);
userdef->uiflag2 &= ~(
USER_UIFLAG2_DEPRECATED_0);
userdef->gp_settings &= ~(
diff --git a/source/blender/makesdna/DNA_scene_types.h
b/source/blender/makesdna/DNA_scene_types.h
index e1819fcb226..733d2fbab30 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1830,7 +1830,7 @@ typedef struct Scene {
enum {
R_SEQ_DEPRECATED_0 = (1 << 0), /* cleared */
R_SEQ_DEPRECATED_1 = (1 << 1), /* cleared */
- R_SEQ_DEPRECATED_3 = (1 << 2), /* cleared */
+ R_SEQ_DEPRECATED_2 = (1 << 2), /* cleared */
R_SEQ_SOLID_TEX = (1 << 3),
R_SEQ_CAMERA_DOF = (1 << 4),
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
