Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-12-18 07:46:41 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-12-18 20:36:34 +0300
commit4c3f57ffa71a2402c8fd42ec4691727b5f209f7e (patch)
tree3b11aa9a841a75bcdff2d42916217e9433de46b1 /source/blender/nodes
parent3471b0016cdf7533d345cb39036cc2401860d5f0 (diff)
Cleanup: compiler warnings with clang
Includes use of memcpy to avoid warnings about deprecated members.
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/NOD_socket_declarations.hh2
-rw-r--r--source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/NOD_socket_declarations.hh b/source/blender/nodes/NOD_socket_declarations.hh
index 3fb21a4263d..c0ba949e337 100644
--- a/source/blender/nodes/NOD_socket_declarations.hh
+++ b/source/blender/nodes/NOD_socket_declarations.hh
@@ -231,7 +231,7 @@ class Shader : public SocketDeclaration {
bNodeSocket &build(bNodeTree &ntree, bNode &node) const override;
bool matches(const bNodeSocket &socket) const override;
- bool can_connect(const bNodeSocket &socket) const;
+ bool can_connect(const bNodeSocket &socket) const override;
};
class ShaderBuilder : public SocketDeclarationBuilder<Shader> {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
index 05d809f7866..a5197b23adb 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc
@@ -979,8 +979,8 @@ static void do_mesh_separation(GeometrySet &geometry_set,
/* Needed in all cases. */
Vector<int> selected_poly_indices;
Vector<int> new_loop_starts;
- int num_selected_polys;
- int num_selected_loops;
+ int num_selected_polys = 0;
+ int num_selected_loops = 0;
const Mesh &mesh_in = *in_component.get_for_read();
Mesh *mesh_out;