Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenloader/intern/versioning_290.c
| Show First 20 Lines • Show All 1,568 Lines • ▼ Show 20 Lines | LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { | ||||
| LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { | LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { | ||||
| if (STREQ(node->idname, "GeometryNodeRandomAttribute")) { | if (STREQ(node->idname, "GeometryNodeRandomAttribute")) { | ||||
| STRNCPY(node->idname, "GeometryNodeAttributeRandomize"); | STRNCPY(node->idname, "GeometryNodeAttributeRandomize"); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { | LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { | ||||
| if (scene->ed != NULL) { | if (scene->toolsettings->sequencer_tool_settings == NULL) { | ||||
| scene->toolsettings->sequencer_tool_settings = SEQ_tool_settings_init(); | scene->toolsettings->sequencer_tool_settings = SEQ_tool_settings_init(); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| if (!MAIN_VERSION_ATLEAST(bmain, 292, 9)) { | if (!MAIN_VERSION_ATLEAST(bmain, 292, 9)) { | ||||
| FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | ||||
| if (ntree->type == NTREE_GEOMETRY) { | if (ntree->type == NTREE_GEOMETRY) { | ||||
| ▲ Show 20 Lines • Show All 396 Lines • ▼ Show 20 Lines | |||||
| if (!MAIN_VERSION_ATLEAST(bmain, 293, 16)) { | if (!MAIN_VERSION_ATLEAST(bmain, 293, 16)) { | ||||
| FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | ||||
| if (ntree->type == NTREE_GEOMETRY) { | if (ntree->type == NTREE_GEOMETRY) { | ||||
| version_node_socket_name(ntree, GEO_NODE_MESH_PRIMITIVE_GRID, "Size", "Size X"); | version_node_socket_name(ntree, GEO_NODE_MESH_PRIMITIVE_GRID, "Size", "Size X"); | ||||
| } | } | ||||
| FOREACH_NODETREE_END; | FOREACH_NODETREE_END; | ||||
| } | } | ||||
| } | |||||
| /** | /* The CU_2D flag has been removed. */ | ||||
| * Versioning code until next subversion bump goes here. | LISTBASE_FOREACH (Curve *, cu, &bmain->curves) { | ||||
| * | #define CU_2D (1 << 3) | ||||
| * \note Be sure to check when bumping the version: | ListBase *nurbs = BKE_curve_nurbs_get(cu); | ||||
| * - "versioning_userdef.c", #blo_do_versions_userdef | bool is_2d = true; | ||||
| * - "versioning_userdef.c", #do_versions_theme | |||||
| * | LISTBASE_FOREACH (Nurb *, nu, nurbs) { | ||||
| * \note Keep this message at the bottom of the function. | if (nu->flag & CU_2D) { | ||||
| */ | nu->flag &= ~CU_2D; | ||||
| { | } | ||||
| /* Keep this block, even when empty. */ | else { | ||||
| is_2d = false; | |||||
| } | |||||
| } | |||||
| #undef CU_2D | |||||
| if (!is_2d && CU_IS_2D(cu)) { | |||||
| cu->flag |= CU_3D; | |||||
| } | |||||
| } | |||||
| } | |||||
| if (!MAIN_VERSION_ATLEAST(bmain, 293, 18)) { | |||||
| FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | ||||
| if (ntree->type == NTREE_GEOMETRY) { | if (ntree->type == NTREE_GEOMETRY) { | ||||
| version_node_socket_name(ntree, GEO_NODE_VOLUME_TO_MESH, "Grid", "Density"); | version_node_socket_name(ntree, GEO_NODE_VOLUME_TO_MESH, "Grid", "Density"); | ||||
| } | } | ||||
| } | } | ||||
| FOREACH_NODETREE_END; | FOREACH_NODETREE_END; | ||||
| if (!DNA_struct_elem_find(fd->filesdna, "bArmature", "float", "axes_position")) { | if (!DNA_struct_elem_find(fd->filesdna, "bArmature", "float", "axes_position")) { | ||||
| Show All 18 Lines | LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { | ||||
| LISTBASE_FOREACH (bNodeTreePath *, path, &snode->treepath) { | LISTBASE_FOREACH (bNodeTreePath *, path, &snode->treepath) { | ||||
| STRNCPY(path->display_name, path->node_name); | STRNCPY(path->display_name, path->node_name); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| /* The CU_2D flag has been removed. */ | /* Consolidate node and final evaluation modes. */ | ||||
| LISTBASE_FOREACH (Curve *, cu, &bmain->curves) { | LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { | ||||
| #define CU_2D (1 << 3) | LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { | ||||
| ListBase *nurbs = BKE_curve_nurbs_get(cu); | LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { | ||||
| bool is_2d = true; | if (sl->spacetype == SPACE_SPREADSHEET) { | ||||
| SpaceSpreadsheet *sspreadsheet = (SpaceSpreadsheet *)sl; | |||||
| LISTBASE_FOREACH (Nurb *, nu, nurbs) { | if (sspreadsheet->object_eval_state == 2) { | ||||
| if (nu->flag & CU_2D) { | sspreadsheet->object_eval_state = SPREADSHEET_OBJECT_EVAL_STATE_EVALUATED; | ||||
| nu->flag &= ~CU_2D; | } | ||||
| } | } | ||||
| else { | |||||
| is_2d = false; | |||||
| } | } | ||||
| } | } | ||||
| #undef CU_2D | |||||
| if (!is_2d && CU_IS_2D(cu)) { | |||||
| cu->flag |= CU_3D; | |||||
| } | } | ||||
| } | } | ||||
| /** | |||||
| * Versioning code until next subversion bump goes here. | |||||
| * | |||||
| * \note Be sure to check when bumping the version: | |||||
| * - "versioning_userdef.c", #blo_do_versions_userdef | |||||
| * - "versioning_userdef.c", #do_versions_theme | |||||
| * | |||||
| * \note Keep this message at the bottom of the function. | |||||
| */ | |||||
| { | |||||
| /* Keep this block, even when empty. */ | |||||
| } | } | ||||
| } | } | ||||