[Bf-blender-cvs] [a90533e9b80] temp_bmesh_multires: Cleanup failed patch reversion
Joseph Eagar
noreply at git.blender.org
Mon May 17 10:06:14 CEST 2021
Commit: a90533e9b80f46f8f15803e78639b673a99b2a9a
Author: Joseph Eagar
Date: Mon May 17 00:45:07 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBa90533e9b80f46f8f15803e78639b673a99b2a9a
Cleanup failed patch reversion
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/modifiers/intern/MOD_nodes_evaluator.cc
M source/blender/modifiers/intern/MOD_nodes_evaluator.hh
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 9ec52a9980e..96c825c5285 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -488,7 +488,6 @@ geometry_node_categories = [
NodeItem("GeometryNodeAttributeClamp"),
NodeItem("GeometryNodeAttributeCompare"),
NodeItem("GeometryNodeAttributeConvert"),
- NodeItem("GeometryNodeAttributeCache"),
NodeItem("GeometryNodeAttributeCurveMap"),
NodeItem("GeometryNodeAttributeFill"),
NodeItem("GeometryNodeAttributeMix"),
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 63b37b5add8..58c94b6f369 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -360,8 +360,8 @@ typedef struct bNode {
/* XXX NODE_UPDATE is a generic update flag. More fine-grained updates
* might be used in the future, but currently all work the same way.
*/
-#define NODE_UPDATE 0xFFFF /* generic update flag (includes all others) */
-#define NODE_UPDATE_ID 1 /* associated id data block has changed */
+#define NODE_UPDATE 0xFFFF /* generic update flag (includes all others) */
+#define NODE_UPDATE_ID 1 /* associated id data block has changed */
#define NODE_UPDATE_OPERATOR 2 /* node update triggered from update operator */
/* Unique hash key for identifying node instances
@@ -407,9 +407,9 @@ typedef struct bNodeLink {
/* link->flag */
#define NODE_LINKFLAG_HILITE (1 << 0) /* link has been successfully validated */
#define NODE_LINK_VALID (1 << 1)
-#define NODE_LINK_TEST (1 << 2) /* free test flag, undefined */
+#define NODE_LINK_TEST (1 << 2) /* free test flag, undefined */
#define NODE_LINK_TEMP_HIGHLIGHT (1 << 3) /* Link is highlighted for picking. */
-#define NODE_LINK_MUTED (1 << 4) /* Link is muted. */
+#define NODE_LINK_MUTED (1 << 4) /* Link is muted. */
/* tree->edit_quality/tree->render_quality */
#define NTREE_QUALITY_HIGH 0
@@ -524,11 +524,11 @@ typedef struct bNodeTree {
#define NTREE_TYPE_INIT 1
/* ntree->flag */
-#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
-#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
-#define NTREE_TWO_PASS (1 << 2) /* two pass */
+#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
+#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
+#define NTREE_TWO_PASS (1 << 2) /* two pass */
#define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */
-#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
+#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer nodes */
/* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */
/* tree is localized copy, free when deleting node groups */
@@ -1318,19 +1318,6 @@ typedef struct NodeAttributeConvert {
int8_t domain;
} NodeAttributeConvert;
-typedef struct NodeAttributeCache {
- /* CustomDataType. */
- int8_t data_type;
-
- /* AttributeDomain. */
- int8_t domain;
- int8_t _pad[6];
-
- void *elems;
- int totelem;
- int elemsize;
-} NodeAttributeCache;
-
typedef struct NodeGeometryMeshCircle {
/* GeometryNodeMeshCircleFillType. */
uint8_t fill_type;
@@ -1382,7 +1369,7 @@ typedef struct NodeGeometryAttributeTransfer {
#define NODE_IES_EXTERNAL 1
/* frame node flags */
-#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
+#define NODE_FRAME_SHRINK 1 /* keep the bounding box minimal */
#define NODE_FRAME_RESIZEABLE 2 /* test flag, if frame can be resized by user */
/* proxy node flags */
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index effadbb745c..a1b6885e7e2 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9047,26 +9047,6 @@ static void def_geo_attribute_convert(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
-static void def_geo_attribute_cache(StructRNA *srna)
-{
- PropertyRNA *prop;
-
- RNA_def_struct_sdna_from(srna, "NodeAttributeCache", "storage");
-
- prop = RNA_def_property(srna, "data_type", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, rna_enum_attribute_type_with_auto_items);
- RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_GeometryNodeAttributeConvert_type_itemf");
- RNA_def_property_enum_default(prop, CD_AUTO_FROM_NAME);
- RNA_def_property_ui_text(prop, "Data Type", "The data type to save the result attribute with");
- RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_GeometryNode_socket_update");
-
- prop = RNA_def_property(srna, "domain", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, rna_enum_attribute_domain_with_auto_items);
- RNA_def_property_enum_default(prop, ATTR_DOMAIN_AUTO);
- RNA_def_property_ui_text(prop, "Domain", "The geometry domain to save the result attribute in");
- RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
-}
-
static void def_geo_attribute_math(StructRNA *srna)
{
PropertyRNA *prop;
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 2bacd36a777..37a21a3c14b 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -914,7 +914,6 @@ static GeometrySet compute_geometry(const DerivedNodeTree &tree,
eval_params.modifier_ = nmd;
eval_params.depsgraph = ctx->depsgraph;
eval_params.self_object = ctx->object;
- eval_params.is_main_eval = ctx->is_main_eval;
eval_params.log_socket_value_fn = log_socket_value;
blender::modifiers::geometry_nodes::evaluate_geometry_nodes(eval_params);
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
index 3844c4f715e..2637c7db0fc 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.cc
@@ -98,7 +98,6 @@ class GeometryNodesEvaluator {
const ModifierData *modifier_;
Depsgraph *depsgraph_;
LogSocketValueFn log_socket_value_fn_;
- bool is_main_eval_;
public:
GeometryNodesEvaluator(GeometryNodesEvaluationParams ¶ms)
@@ -109,8 +108,7 @@ class GeometryNodesEvaluator {
self_object_(params.self_object),
modifier_(¶ms.modifier_->modifier),
depsgraph_(params.depsgraph),
- log_socket_value_fn_(std::move(params.log_socket_value_fn)),
- is_main_eval_(params.is_main_eval)
+ log_socket_value_fn_(std::move(params.log_socket_value_fn))
{
for (auto item : params.input_values.items()) {
this->log_socket_value(item.key, item.value);
@@ -237,7 +235,7 @@ class GeometryNodesEvaluator {
params_provider.dnode = node;
params_provider.self_object = self_object_;
params_provider.depsgraph = depsgraph_;
- params_provider.is_main_eval = is_main_eval_;
+ params_provider.allocator = &allocator_;
params_provider.input_values = &node_inputs_map;
params_provider.output_values = &node_outputs_map;
params_provider.modifier = modifier_;
diff --git a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
index 5a636e7efbb..84249e4244e 100644
--- a/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
+++ b/source/blender/modifiers/intern/MOD_nodes_evaluator.hh
@@ -43,9 +43,8 @@ struct GeometryNodesEvaluationParams {
Depsgraph *depsgraph;
Object *self_object;
LogSocketValueFn log_socket_value_fn;
- Vector<GMutablePointer> r_output_values;
- bool is_main_eval;
+ Vector<GMutablePointer> r_output_values;
};
void evaluate_geometry_nodes(GeometryNodesEvaluationParams ¶ms);
More information about the Bf-blender-cvs
mailing list