blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix #107608 : Changing color for simulation zone doesn't save #107808

Closed
Philipp Oeser wants to merge 2 commits from lichtwerk:107608 into main
pull from: lichtwerk:107608
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 2 Files Changed 2 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@ -25,7 +25,7 @@ extern "C" {
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 7 #define BLENDER_FILE_SUBVERSION 8
/* Minimum Blender version that supports reading file written with the current /* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file * version. Older Blender versions will test this and show a warning if the file

6
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -97,6 +97,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology); FROM_DEFAULT_V4_UCHAR(space_view3d.face_retopology);
} }
if (!USER_VERSION_ATLEAST(306, 8)) {
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_simulation);
FROM_DEFAULT_V4_UCHAR(space_action.simulated_frames);
}
/** /**
* Versioning code until next subversion bump goes here. * Versioning code until next subversion bump goes here.
* *
@ -108,8 +112,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/ */
{ {
/* Keep this block, even when empty. */ /* Keep this block, even when empty. */
FROM_DEFAULT_V4_UCHAR(space_node.node_zone_simulation);
FROM_DEFAULT_V4_UCHAR(space_action.simulated_frames);
} }
#undef FROM_DEFAULT_V4_UCHAR #undef FROM_DEFAULT_V4_UCHAR