[Bf-blender-cvs] [af7cc3f8bbc] geometry-nodes: Fix merge issues
Jacques Lucke
noreply at git.blender.org
Mon Nov 9 12:46:16 CET 2020
Commit: af7cc3f8bbcd8350ae28d08b1648dc289866af04
Author: Jacques Lucke
Date: Mon Nov 9 12:46:04 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rBaf7cc3f8bbcd8350ae28d08b1648dc289866af04
Fix merge issues
===================================================================
M source/blender/modifiers/intern/MOD_nodes.cc
M source/blender/nodes/geometry/nodes/node_geo_boolean.cc
M source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
M source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index 093947a42f5..79da3a77744 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -375,13 +375,13 @@ static IDProperty *socket_add_property(IDProperty *settings_prop_group,
IDP_AddToGroup(prop_ui_group, property_type.create_max_ui_prop(socket, "max"));
IDP_AddToGroup(prop_ui_group, property_type.create_max_ui_prop(socket, "soft_max"));
IDP_AddToGroup(prop_ui_group, property_type.create_default_ui_prop(socket, "default"));
- if (property_type.rna_subtype_get != NULL) {
- const char *subtype_identifier = NULL;
+ if (property_type.rna_subtype_get != nullptr) {
+ const char *subtype_identifier = nullptr;
RNA_enum_identifier(rna_enum_property_subtype_items,
property_type.rna_subtype_get(socket),
&subtype_identifier);
- if (subtype_identifier != NULL) {
+ if (subtype_identifier != nullptr) {
IDPropertyTemplate idprop = {0};
idprop.string.str = subtype_identifier;
idprop.string.len = BLI_strnlen(subtype_identifier, MAX_NAME) + 1;
@@ -582,7 +582,7 @@ void MOD_nodes_update_interface(Object *object, NodesModifierData *nmd)
IDProperty *new_prop = socket_add_property(
nmd->settings.properties, ui_container_group, *property_type, *socket);
- if (old_properties != NULL) {
+ if (old_properties != nullptr) {
IDProperty *old_prop = IDP_GetPropertyFromGroup(old_properties, socket->identifier);
if (old_prop != nullptr && property_type->is_correct_type(*old_prop)) {
IDP_CopyPropertyContent(new_prop, old_prop);
@@ -590,7 +590,7 @@ void MOD_nodes_update_interface(Object *object, NodesModifierData *nmd)
}
}
- if (old_properties != NULL) {
+ if (old_properties != nullptr) {
IDP_FreeProperty(old_properties);
}
@@ -605,8 +605,8 @@ void MOD_nodes_init(Main *bmain, NodesModifierData *nmd)
ntreeAddSocketInterface(ntree, SOCK_IN, "NodeSocketGeometry", "Geometry");
ntreeAddSocketInterface(ntree, SOCK_OUT, "NodeSocketGeometry", "Geometry");
- bNode *group_input_node = nodeAddStaticNode(NULL, ntree, NODE_GROUP_INPUT);
- bNode *group_output_node = nodeAddStaticNode(NULL, ntree, NODE_GROUP_OUTPUT);
+ bNode *group_input_node = nodeAddStaticNode(nullptr, ntree, NODE_GROUP_INPUT);
+ bNode *group_output_node = nodeAddStaticNode(nullptr, ntree, NODE_GROUP_OUTPUT);
group_input_node->locx = -200 - group_input_node->width;
group_output_node->locx = 200;
@@ -820,7 +820,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel)
uiLayoutSetPropSep(layout, true);
uiLayoutSetPropDecorate(layout, false);
- uiItemR(layout, ptr, "node_group", 0, NULL, ICON_MESH_DATA);
+ uiItemR(layout, ptr, "node_group", 0, nullptr, ICON_MESH_DATA);
if (nmd->node_group != nullptr && nmd->settings.properties != nullptr) {
PointerRNA settings_ptr;
@@ -896,25 +896,25 @@ ModifierTypeInfo modifierType_Nodes = {
/* copyData */ copyData,
- /* deformVerts */ NULL,
- /* deformMatrices */ NULL,
- /* deformVertsEM */ NULL,
- /* deformMatricesEM */ NULL,
+ /* deformVerts */ nullptr,
+ /* deformMatrices */ nullptr,
+ /* deformVertsEM */ nullptr,
+ /* deformMatricesEM */ nullptr,
/* modifyMesh */ modifyMesh,
- /* modifyHair */ NULL,
+ /* modifyHair */ nullptr,
/* modifyPointCloud */ modifyPointCloud,
- /* modifyVolume */ NULL,
+ /* modifyVolume */ nullptr,
/* initData */ initData,
- /* requiredDataMask */ NULL,
+ /* requiredDataMask */ nullptr,
/* freeData */ freeData,
/* isDisabled */ isDisabled,
/* updateDepsgraph */ updateDepsgraph,
- /* dependsOnTime */ NULL,
- /* dependsOnNormals */ NULL,
+ /* dependsOnTime */ nullptr,
+ /* dependsOnNormals */ nullptr,
/* foreachIDLink */ foreachIDLink,
- /* foreachTexLink */ NULL,
- /* freeRuntimeData */ NULL,
+ /* foreachTexLink */ nullptr,
+ /* freeRuntimeData */ nullptr,
/* panelRegister */ panelRegister,
/* blendWrite */ blendWrite,
/* blendRead */ blendRead,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
index 87103d3d6fd..09ec290a1ed 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
@@ -91,9 +91,10 @@ static Mesh *mesh_boolean_calc(const Mesh *mesh_a, const Mesh *mesh_b, int boole
}
}
- BM_mesh_boolean(bm, looptris, tottri, bm_face_isect_pair, NULL, 2, false, boolean_mode);
+ BM_mesh_boolean(
+ bm, looptris, tottri, bm_face_isect_pair, nullptr, 2, false, false, boolean_mode);
- Mesh *result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh_a);
+ Mesh *result = BKE_mesh_from_bmesh_for_eval_nomain(bm, nullptr, mesh_a);
BM_mesh_free(bm);
result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
MEM_freeN(looptris);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
index 0c7e62db06d..23f48081177 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
@@ -61,7 +61,8 @@ static void geo_edge_split_exec(bNode *UNUSED(node), GeoNodeInputs inputs, GeoNo
const Mesh *mesh_in = geometry->get_mesh_for_read();
/* Use modifier struct to pass arguments to the modifier code. */
- EdgeSplitModifierData emd = {0};
+ EdgeSplitModifierData emd;
+ memset(&emd, 0, sizeof(EdgeSplitModifierData));
emd.split_angle = split_angle;
emd.flags = MOD_EDGESPLIT_FROMANGLE;
if (use_sharp_flag) {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
index 45fcda5f797..cf2c761bffa 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
@@ -44,7 +44,7 @@ static void geo_point_instance_exec(bNode *UNUSED(node),
/* For now make a mesh from the pointcloud instead of instancing another object / geometry. */
const PointCloud *pointcloud = geometry->get_pointcloud_for_read();
- if (pointcloud == NULL) {
+ if (pointcloud == nullptr) {
outputs.set("Geometry", std::move(geometry));
return;
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
index 0bc0f444c40..2ddc6dba132 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
@@ -90,7 +90,7 @@ static void geo_subdivision_surface_exec(bNode *UNUSED(node),
Subdiv *subdiv = BKE_subdiv_update_from_mesh(nullptr, &subdiv_settings, mesh_in);
/* In case of bad topology, skip to input mesh. */
- if (subdiv == NULL) {
+ if (subdiv == nullptr) {
outputs.set("Geometry", std::move(geometry));
return;
}
More information about the Bf-blender-cvs
mailing list