[Bf-blender-cvs] [c0d0e2788b0] master: Cleanup: compiler warnings with clang
Brecht Van Lommel
noreply at git.blender.org
Fri Jan 14 15:25:59 CET 2022
Commit: c0d0e2788b062e6268a533de8cebc4af5625bc75
Author: Brecht Van Lommel
Date: Fri Jan 14 12:28:34 2022 +0100
Branches: master
https://developer.blender.org/rBc0d0e2788b062e6268a533de8cebc4af5625bc75
Cleanup: compiler warnings with clang
===================================================================
M source/blender/blenlib/tests/BLI_math_vec_types_test.cc
M source/blender/editors/render/render_opengl.cc
M source/blender/functions/FN_field.hh
M source/blender/modifiers/intern/MOD_weld.cc
===================================================================
diff --git a/source/blender/blenlib/tests/BLI_math_vec_types_test.cc b/source/blender/blenlib/tests/BLI_math_vec_types_test.cc
index 8aa1f90fde2..c9be404139e 100644
--- a/source/blender/blenlib/tests/BLI_math_vec_types_test.cc
+++ b/source/blender/blenlib/tests/BLI_math_vec_types_test.cc
@@ -38,14 +38,14 @@ TEST(math_vec_types, ScalarConstructorDouble)
TEST(math_vec_types, MultiScalarConstructorVec2)
{
- int2 i(5.5f, -1.8);
+ int2 i(5, -1);
EXPECT_EQ(i[0], 5);
EXPECT_EQ(i[1], -1);
}
TEST(math_vec_types, MultiScalarConstructorVec3)
{
- int3 i(5.5f, -1.8, 6u);
+ int3 i(5, -1, 6u);
EXPECT_EQ(i[0], 5);
EXPECT_EQ(i[1], -1);
EXPECT_EQ(i[2], 6);
@@ -53,7 +53,7 @@ TEST(math_vec_types, MultiScalarConstructorVec3)
TEST(math_vec_types, MultiScalarConstructorVec4)
{
- int4 i(5.5f, -1.8, 6u, 0.888f);
+ int4 i(5, -1, 6u, 0);
EXPECT_EQ(i[0], 5);
EXPECT_EQ(i[1], -1);
EXPECT_EQ(i[2], 6);
diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc
index 88aed0ae174..8bd0244c899 100644
--- a/source/blender/editors/render/render_opengl.cc
+++ b/source/blender/editors/render/render_opengl.cc
@@ -1115,7 +1115,7 @@ static bool schedule_write_result(OGLRender *oglrender, RenderResult *rr)
Scene *scene = oglrender->scene;
WriteTaskData *task_data = MEM_new<WriteTaskData>("write task data");
task_data->rr = rr;
- task_data->tmp_scene = *scene;
+ memcpy(&task_data->tmp_scene, scene, sizeof(task_data->tmp_scene));
BLI_mutex_lock(&oglrender->task_mutex);
oglrender->num_scheduled_frames++;
if (oglrender->num_scheduled_frames > MAX_SCHEDULED_FRAMES) {
diff --git a/source/blender/functions/FN_field.hh b/source/blender/functions/FN_field.hh
index 1b89c5353e9..e869927c33b 100644
--- a/source/blender/functions/FN_field.hh
+++ b/source/blender/functions/FN_field.hh
@@ -308,7 +308,7 @@ struct FieldInputs {
*/
class FieldContext {
public:
- ~FieldContext() = default;
+ virtual ~FieldContext() = default;
virtual GVArray get_varray_for_input(const FieldInput &field_input,
IndexMask mask,
diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc
index 92207e1fbe6..3a06c6a649b 100644
--- a/source/blender/modifiers/intern/MOD_weld.cc
+++ b/source/blender/modifiers/intern/MOD_weld.cc
@@ -612,7 +612,7 @@ static void weld_edge_groups_setup(const int medge_len,
int wgroups_len = wedge.size() - edge_kill_len;
r_edge_groups.reinitialize(wgroups_len);
- r_edge_groups.fill({0});
+ r_edge_groups.fill({{0}});
MutableSpan<WeldGroupEdge> wegroups = r_edge_groups;
wegrp_iter = &r_edge_groups[0];
More information about the Bf-blender-cvs
mailing list