diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 68 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.cc | 9 |
3 files changed, 40 insertions, 39 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index e2788020628..d71cb559911 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,7 +39,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 21 +#define BLENDER_FILE_SUBVERSION 22 /* 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 diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 0d70e812ecb..9df3d7c544d 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1412,34 +1412,34 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_EDGE_SPLIT 1001 #define GEO_NODE_TRANSFORM 1002 #define GEO_NODE_BOOLEAN 1003 -#define GEO_NODE_POINT_DISTRIBUTE 1004 -#define GEO_NODE_POINT_INSTANCE 1005 +#define GEO_NODE_LEGACY_POINT_DISTRIBUTE 1004 +#define GEO_NODE_LEGACY_POINT_INSTANCE 1005 #define GEO_NODE_SUBDIVISION_SURFACE 1006 #define GEO_NODE_OBJECT_INFO 1007 -#define GEO_NODE_ATTRIBUTE_RANDOMIZE 1008 -#define GEO_NODE_ATTRIBUTE_MATH 1009 +#define GEO_NODE_LEGACY_ATTRIBUTE_RANDOMIZE 1008 +#define GEO_NODE_LEGACY_ATTRIBUTE_MATH 1009 #define GEO_NODE_JOIN_GEOMETRY 1010 -#define GEO_NODE_ATTRIBUTE_FILL 1011 -#define GEO_NODE_ATTRIBUTE_MIX 1012 -#define GEO_NODE_ATTRIBUTE_COLOR_RAMP 1013 -#define GEO_NODE_POINT_SEPARATE 1014 -#define GEO_NODE_ATTRIBUTE_COMPARE 1015 -#define GEO_NODE_POINT_ROTATE 1016 -#define GEO_NODE_ATTRIBUTE_VECTOR_MATH 1017 -#define GEO_NODE_ALIGN_ROTATION_TO_VECTOR 1018 -#define GEO_NODE_POINT_TRANSLATE 1019 -#define GEO_NODE_POINT_SCALE 1020 -#define GEO_NODE_ATTRIBUTE_SAMPLE_TEXTURE 1021 -#define GEO_NODE_POINTS_TO_VOLUME 1022 +#define GEO_NODE_LEGACY_ATTRIBUTE_FILL 1011 +#define GEO_NODE_LEGACY_ATTRIBUTE_MIX 1012 +#define GEO_NODE_LEGACY_ATTRIBUTE_COLOR_RAMP 1013 +#define GEO_NODE_LEGACY_POINT_SEPARATE 1014 +#define GEO_NODE_LEGACY_ATTRIBUTE_COMPARE 1015 +#define GEO_NODE_LEGACY_POINT_ROTATE 1016 +#define GEO_NODE_LEGACY_ATTRIBUTE_VECTOR_MATH 1017 +#define GEO_NODE_LEGACY_ALIGN_ROTATION_TO_VECTOR 1018 +#define GEO_NODE_LEGACY_POINT_TRANSLATE 1019 +#define GEO_NODE_LEGACY_POINT_SCALE 1020 +#define GEO_NODE_LEGACY_ATTRIBUTE_SAMPLE_TEXTURE 1021 +#define GEO_NODE_LEGACY_POINTS_TO_VOLUME 1022 #define GEO_NODE_COLLECTION_INFO 1023 #define GEO_NODE_IS_VIEWPORT 1024 -#define GEO_NODE_ATTRIBUTE_PROXIMITY 1025 +#define GEO_NODE_LEGACY_ATTRIBUTE_PROXIMITY 1025 #define GEO_NODE_VOLUME_TO_MESH 1026 -#define GEO_NODE_ATTRIBUTE_COMBINE_XYZ 1027 -#define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028 +#define GEO_NODE_LEGACY_ATTRIBUTE_COMBINE_XYZ 1027 +#define GEO_NODE_LEGACY_ATTRIBUTE_SEPARATE_XYZ 1028 #define GEO_NODE_MESH_SUBDIVIDE 1029 #define GEO_NODE_ATTRIBUTE_REMOVE 1030 -#define GEO_NODE_ATTRIBUTE_CONVERT 1031 +#define GEO_NODE_LEGACY_ATTRIBUTE_CONVERT 1031 #define GEO_NODE_MESH_PRIMITIVE_CUBE 1032 #define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1033 #define GEO_NODE_MESH_PRIMITIVE_UV_SPHERE 1034 @@ -1448,28 +1448,28 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_MESH_PRIMITIVE_CONE 1037 #define GEO_NODE_MESH_PRIMITIVE_LINE 1038 #define GEO_NODE_MESH_PRIMITIVE_GRID 1039 -#define GEO_NODE_ATTRIBUTE_MAP_RANGE 1040 -#define GEO_NODE_ATTRIBUTE_CLAMP 1041 +#define GEO_NODE_LEGACY_ATTRIBUTE_MAP_RANGE 1040 +#define GEO_NODE_LECAGY_ATTRIBUTE_CLAMP 1041 #define GEO_NODE_BOUNDING_BOX 1042 #define GEO_NODE_SWITCH 1043 -#define GEO_NODE_ATTRIBUTE_TRANSFER 1044 +#define GEO_NODE_LEGACY_ATTRIBUTE_TRANSFER 1044 #define GEO_NODE_CURVE_TO_MESH 1045 -#define GEO_NODE_ATTRIBUTE_CURVE_MAP 1046 +#define GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP 1046 #define GEO_NODE_CURVE_RESAMPLE 1047 #define GEO_NODE_ATTRIBUTE_VECTOR_ROTATE 1048 -#define GEO_NODE_MATERIAL_ASSIGN 1049 +#define GEO_NODE_LEGACY_MATERIAL_ASSIGN 1049 #define GEO_NODE_INPUT_MATERIAL 1050 #define GEO_NODE_MATERIAL_REPLACE 1051 -#define GEO_NODE_MESH_TO_CURVE 1052 -#define GEO_NODE_DELETE_GEOMETRY 1053 +#define GEO_NODE_LEGACY_MESH_TO_CURVE 1052 +#define GEO_NODE_LEGACY_DELETE_GEOMETRY 1053 #define GEO_NODE_CURVE_LENGTH 1054 -#define GEO_NODE_SELECT_BY_MATERIAL 1055 +#define GEO_NODE_LEGACY_SELECT_BY_MATERIAL 1055 #define GEO_NODE_CONVEX_HULL 1056 #define GEO_NODE_CURVE_TO_POINTS 1057 -#define GEO_NODE_CURVE_REVERSE 1058 +#define GEO_NODE_LEGACY_CURVE_REVERSE 1058 #define GEO_NODE_SEPARATE_COMPONENTS 1059 -#define GEO_NODE_CURVE_SUBDIVIDE 1060 -#define GEO_NODE_RAYCAST 1061 +#define GEO_NODE_LEGACY_CURVE_SUBDIVIDE 1060 +#define GEO_NODE_LEGACY_RAYCAST 1061 #define GEO_NODE_CURVE_PRIMITIVE_STAR 1062 #define GEO_NODE_CURVE_PRIMITIVE_SPIRAL 1063 #define GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER 1064 @@ -1480,9 +1480,9 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_ENDPOINTS 1069 #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 #define GEO_NODE_CURVE_TRIM 1071 -#define GEO_NODE_CURVE_SET_HANDLES 1072 -#define GEO_NODE_CURVE_SPLINE_TYPE 1073 -#define GEO_NODE_CURVE_SELECT_HANDLES 1074 +#define GEO_NODE_LEGACY_CURVE_SET_HANDLES 1072 +#define GEO_NODE_LEGACY_CURVE_SPLINE_TYPE 1073 +#define GEO_NODE_LEGACY_CURVE_SELECT_HANDLES 1074 #define GEO_NODE_CURVE_FILL 1075 #define GEO_NODE_INPUT_POSITION 1076 #define GEO_NODE_SET_POSITION 1077 diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 950026b9d65..e6af587cbd7 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -511,7 +511,8 @@ void ntreeBlendWrite(BlendWriter *writer, bNodeTree *ntree) ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB)) { BKE_curvemapping_blend_write(writer, (const CurveMapping *)node->storage); } - else if ((ntree->type == NTREE_GEOMETRY) && (node->type == GEO_NODE_ATTRIBUTE_CURVE_MAP)) { + else if ((ntree->type == NTREE_GEOMETRY) && + (node->type == GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP)) { BLO_write_struct_by_name(writer, node->typeinfo->storagename, node->storage); NodeAttributeCurveMap *data = (NodeAttributeCurveMap *)node->storage; BKE_curvemapping_blend_write(writer, (const CurveMapping *)data->curve_vec); @@ -689,7 +690,7 @@ void ntreeBlendReadData(BlendDataReader *reader, bNodeTree *ntree) BKE_curvemapping_blend_read(reader, (CurveMapping *)node->storage); break; } - case GEO_NODE_ATTRIBUTE_CURVE_MAP: { + case GEO_NODE_LEGACY_ATTRIBUTE_CURVE_MAP: { NodeAttributeCurveMap *data = (NodeAttributeCurveMap *)node->storage; BLO_read_data_address(reader, &data->curve_vec); if (data->curve_vec) { @@ -3888,7 +3889,7 @@ void nodeSetActive(bNodeTree *ntree, bNode *node) } } if ((node->typeinfo->nclass == NODE_CLASS_TEXTURE) || - (node->typeinfo->type == GEO_NODE_ATTRIBUTE_SAMPLE_TEXTURE)) { + (node->typeinfo->type == GEO_NODE_LEGACY_ATTRIBUTE_SAMPLE_TEXTURE)) { tnode->flag &= ~NODE_ACTIVE_TEXTURE; } } @@ -3898,7 +3899,7 @@ void nodeSetActive(bNodeTree *ntree, bNode *node) node->flag |= NODE_ACTIVE_ID; } if ((node->typeinfo->nclass == NODE_CLASS_TEXTURE) || - (node->typeinfo->type == GEO_NODE_ATTRIBUTE_SAMPLE_TEXTURE)) { + (node->typeinfo->type == GEO_NODE_LEGACY_ATTRIBUTE_SAMPLE_TEXTURE)) { node->flag |= NODE_ACTIVE_TEXTURE; } } |