From ded679d86661b9269a36490e34d67c90198b45e6 Mon Sep 17 00:00:00 2001 From: Fabian Schempp Date: Thu, 20 May 2021 20:21:06 +0200 Subject: Initial setup for decimate node --- source/blender/blenkernel/BKE_node.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index fbe7e91e985..83fcde2b9b6 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1422,6 +1422,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_ATTRIBUTE_CURVE_MAP 1046 #define GEO_NODE_CURVE_RESAMPLE 1047 #define GEO_NODE_ATTRIBUTE_VECTOR_ROTATE 1048 +#define GEO_NODE_DECIMATE 1049 /** \} */ -- cgit v1.2.3 From 78322cbee66de5a9c8bef2969bd410e1e5c96f95 Mon Sep 17 00:00:00 2001 From: Fabian Schempp Date: Fri, 2 Jul 2021 20:49:28 +0200 Subject: Split decimate into three different nodes. --- source/blender/blenkernel/BKE_node.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 6b300dc5559..60fe0df17cb 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1440,7 +1440,9 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_SUBDIVIDE 1060 #define GEO_NODE_RAYCAST 1061 #define GEO_NODE_DECIMATE 1062 - +#define GEO_NODE_COLLAPSE 1063 +#define GEO_NODE_UNSUBDIVIDE 1064 +#define GEO_NODE_DISSOLVE 1065 /** \} */ /* -------------------------------------------------------------------- */ -- cgit v1.2.3 From 703bdbe4922ba2193860611131baaa44108b8ffe Mon Sep 17 00:00:00 2001 From: Fabian Schempp Date: Fri, 2 Jul 2021 21:49:59 +0200 Subject: removed decimate node and reformatting --- source/blender/blenkernel/BKE_node.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 60fe0df17cb..868d154f21e 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1439,10 +1439,9 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_SEPARATE_COMPONENTS 1059 #define GEO_NODE_CURVE_SUBDIVIDE 1060 #define GEO_NODE_RAYCAST 1061 -#define GEO_NODE_DECIMATE 1062 -#define GEO_NODE_COLLAPSE 1063 -#define GEO_NODE_UNSUBDIVIDE 1064 -#define GEO_NODE_DISSOLVE 1065 +#define GEO_NODE_COLLAPSE 1062 +#define GEO_NODE_UNSUBDIVIDE 1063 +#define GEO_NODE_DISSOLVE 1064 /** \} */ /* -------------------------------------------------------------------- */ -- cgit v1.2.3 From c1bd9ecd0145cb9c106172e5e838b797b70ae793 Mon Sep 17 00:00:00 2001 From: Aidan Haile Date: Thu, 15 Jul 2021 22:15:47 +0200 Subject: Fix T49944: Compositor ID Mask Anti-Aliasing not working Replaces current ID Mask node Anti-Aliasing operation by SMAA operations with default settings as proposed by Jeroen Bakker. SMAA produces smoother edges. Reviewed By: manzanilla Differential Revision: https://developer.blender.org/D11881 --- source/blender/blenkernel/BKE_node.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 35444bc9fa5..2b68a935f1a 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1274,6 +1274,11 @@ void ntreeGPUMaterialNodes(struct bNodeTree *localtree, #define CMP_CRYPTOMATTE_SRC_RENDER 0 #define CMP_CRYPTOMATTE_SRC_IMAGE 1 +/* Default SMAA configuration values. */ +#define CMP_DEFAULT_SMAA_THRESHOLD 1.0f +#define CMP_DEFAULT_SMAA_CONTRAST_LIMIT 0.2f +#define CMP_DEFAULT_SMAA_CORNER_ROUNDING 0.25f + /* API */ void ntreeCompositExecTree(struct Scene *scene, struct bNodeTree *ntree, -- cgit v1.2.3 From 54c69bf72922ecdcd14dd8ffb219379727547869 Mon Sep 17 00:00:00 2001 From: Angus Stanton Date: Sun, 18 Jul 2021 14:05:57 -0400 Subject: Geometry Nodes: Curve Trim Node This node implements shortening each spline in the curve based on either a length from the start of each spline, or a factor of the total length of each spline, similar to the "Start & End Mapping" panel of curve properties. For Bezier curves, the first and last control points are adjusted to maintain the shape of the curve, but NURB splines are currently implicitly converted to poly splines. The node is implemented to avoid copying where possible, so it outputs a changed version of the input curve rather than a new one. Differential Revision: https://developer.blender.org/D11901 --- source/blender/blenkernel/BKE_node.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 2b68a935f1a..dd3f1b4b27f 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1464,9 +1464,10 @@ int ntreeTexExecTree(struct bNodeTree *ntree, #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068 #define GEO_NODE_CURVE_ENDPOINTS 1069 #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070 -#define GEO_NODE_COLLAPSE 1071 -#define GEO_NODE_UNSUBDIVIDE 1072 -#define GEO_NODE_DISSOLVE 1073 +#define GEO_NODE_CURVE_TRIM 1071 +#define GEO_NODE_COLLAPSE 1072 +#define GEO_NODE_UNSUBDIVIDE 1073 +#define GEO_NODE_DISSOLVE 1074 /** \} */ /* -------------------------------------------------------------------- */ -- cgit v1.2.3 From 4d25d74a1ac92594e55db31e014fbcae774dbb30 Mon Sep 17 00:00:00 2001 From: Johnny Matthews Date: Thu, 22 Jul 2021 10:55:50 -0400 Subject: Geometry Nodes: Set Bezier Handle Type Node This node takes a curve and a point selection and allows you to set the specified (or all) points left/right or both handles to a given type. Differential Revision: https://developer.blender.org/D11992 --- source/blender/blenkernel/BKE_node.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/BKE_node.h') diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index dd3f1b4b27f..bb73e97e809 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1465,9 +1465,10 @@ 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_COLLAPSE 1072 -#define GEO_NODE_UNSUBDIVIDE 1073 -#define GEO_NODE_DISSOLVE 1074 +#define GEO_NODE_CURVE_SET_HANDLES 1072 +#define GEO_NODE_COLLAPSE 1073 +#define GEO_NODE_UNSUBDIVIDE 1074 +#define GEO_NODE_DISSOLVE 1075 /** \} */ /* -------------------------------------------------------------------- */ -- cgit v1.2.3