Commit: 2d0dc88209e166159bd0b68dc54103280b09193c Author: Jacques Lucke Date: Wed Jun 22 10:56:21 2022 +0200 Branches: temp-deform-curves-with-surface https://developer.blender.org/rB2d0dc88209e166159bd0b68dc54103280b09193c
Merge branch 'master' into deform-curves-with-surface =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index d9a0b841708,59a1599e7ae..5917f9b88d7 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1493,7 -1493,9 +1493,10 @@@ struct TexResult #define GEO_NODE_STORE_NAMED_ATTRIBUTE 1156 #define GEO_NODE_INPUT_NAMED_ATTRIBUTE 1157 #define GEO_NODE_REMOVE_ATTRIBUTE 1158 - #define GEO_NODE_DEFORM_CURVES_WITH_SURFACE 1159 + #define GEO_NODE_INPUT_INSTANCE_ROTATION 1159 + #define GEO_NODE_INPUT_INSTANCE_SCALE 1160 + #define GEO_NODE_VOLUME_CUBE 1161 ++#define GEO_NODE_DEFORM_CURVES_WITH_SURFACE 1162 /** \} */ diff --cc source/blender/nodes/NOD_static_types.h index 69f2e29eb41,9793f133dd6..54336ac65d0 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@@ -395,8 -397,8 +397,9 @@@ DefNode(GeometryNode, GEO_NODE_TRANSLAT DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "") DefNode(GeometryNode, GEO_NODE_TRIM_CURVE, def_geo_curve_trim, "TRIM_CURVE", TrimCurve, "Trim Curve", "") DefNode(GeometryNode, GEO_NODE_VIEWER, def_geo_viewer, "VIEWER", Viewer, "Viewer", "") + DefNode(GeometryNode, GEO_NODE_VOLUME_CUBE, 0, "VOLUME_CUBE", VolumeCube, "Volume Cube", "") DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "") +DefNode(GeometryNode, GEO_NODE_DEFORM_CURVES_WITH_SURFACE, 0, "DEFORM_CURVES_WITH_SURFACE", DeformCurvesWithSurface, "Deform Curves with Surface", "") /* undefine macros */ #undef DefNode _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
