Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenloader/intern/versioning_290.c
| Show First 20 Lines • Show All 1,550 Lines • ▼ Show 20 Lines | if (!MAIN_VERSION_ATLEAST(bmain, 292, 13)) { | ||||
| 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_BOOLEAN, "Geometry A", "Geometry 1"); | version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry A", "Geometry 1"); | ||||
| version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry B", "Geometry 2"); | version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry B", "Geometry 2"); | ||||
| } | } | ||||
| } | } | ||||
| FOREACH_NODETREE_END; | FOREACH_NODETREE_END; | ||||
| /* Init grease pencil default curve resolution. */ | /* Init grease pencil default curve resolution. */ | ||||
| if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) { | if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) { | ||||
| LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { | LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { | ||||
| gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION; | gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION; | ||||
| gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION; | gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION; | ||||
| } | } | ||||
| } | } | ||||
| /* Init grease pencil curve editing error threshold. */ | /* Init grease pencil curve editing error threshold. */ | ||||
| if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) { | if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) { | ||||
| LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { | LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { | ||||
| gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR; | gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR; | ||||
| gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE; | gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
HooglyBoogly: I think this change shouldn't be in here? | |||||
| if (!MAIN_VERSION_ATLEAST(bmain, 292, 14)) { | |||||
| FOREACH_NODETREE_BEGIN (bmain, ntree, id) { | |||||
| if (ntree->type != NTREE_GEOMETRY) { | |||||
| continue; | |||||
| } | |||||
| LISTBASE_FOREACH (bNode *, node, &ntree->nodes) { | |||||
| if (node->type == GEO_NODE_OBJECT_INFO && node->storage == NULL) { | |||||
| NodeGeometryObjectInfo *data = (NodeGeometryObjectInfo *)MEM_callocN( | |||||
| sizeof(NodeGeometryObjectInfo), __func__); | |||||
| data->transform_space = GEO_NODE_TRANSFORM_SPACE_RELATIVE; | |||||
| node->storage = data; | |||||
| } | |||||
| } | |||||
| } | |||||
| FOREACH_NODETREE_END; | |||||
| } | |||||
| /** | /** | ||||
| * Versioning code until next subversion bump goes here. | * Versioning code until next subversion bump goes here. | ||||
| * | * | ||||
| * \note Be sure to check when bumping the version: | * \note Be sure to check when bumping the version: | ||||
| * - "versioning_userdef.c", #blo_do_versions_userdef | * - "versioning_userdef.c", #blo_do_versions_userdef | ||||
| * - "versioning_userdef.c", #do_versions_theme | * - "versioning_userdef.c", #do_versions_theme | ||||
| * | * | ||||
| * \note Keep this message at the bottom of the function. | * \note Keep this message at the bottom of the function. | ||||
| */ | */ | ||||
| { | { | ||||
| /* Keep this block, even when empty. */ | /* Keep this block, even when empty. */ | ||||
| } | } | ||||
| } | } | ||||
I think this change shouldn't be in here?