diff options
| -rw-r--r-- | extern/glew/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | extern/lzma/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | source/blender/alembic/intern/abc_mesh.h | 8 | ||||
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 2 | ||||
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt index e0773d828ec..18ca88e6fec 100644 --- a/extern/glew/CMakeLists.txt +++ b/extern/glew/CMakeLists.txt @@ -18,6 +18,13 @@ # All rights reserved. # ***** END GPL LICENSE BLOCK ***** +# avoid noisy warnings +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + add_c_flag( + "-Wno-strict-prototypes" + ) +endif() + set(INC include ) diff --git a/extern/lzma/CMakeLists.txt b/extern/lzma/CMakeLists.txt index 8bdddf0aced..d76b418fd74 100644 --- a/extern/lzma/CMakeLists.txt +++ b/extern/lzma/CMakeLists.txt @@ -18,6 +18,13 @@ # All rights reserved. # ***** END GPL LICENSE BLOCK ***** +# avoid noisy warnings +if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") + add_c_flag( + "-Wno-self-assign" + ) +endif() + set(INC . ) diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h index 77686a0204e..c15fb948e03 100644 --- a/source/blender/alembic/intern/abc_mesh.h +++ b/source/blender/alembic/intern/abc_mesh.h @@ -100,16 +100,16 @@ class AbcMeshReader : public AbcObjectReader { public: AbcMeshReader(const Alembic::Abc::IObject &object, ImportSettings &settings); - bool valid() const; + bool valid() const override; bool accepts_object_type(const Alembic::AbcCoreAbstract::ObjectHeader &alembic_header, const Object *const ob, - const char **err_str) const; - void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel); + const char **err_str) const override; + void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel) override; struct Mesh *read_mesh(struct Mesh *existing_mesh, const Alembic::Abc::ISampleSelector &sample_sel, int read_flag, - const char **err_str); + const char **err_str) override; bool topology_changed(Mesh *existing_mesh, const Alembic::Abc::ISampleSelector &sample_sel) override; diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index f7ba925530b..dc525e0c46c 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -984,7 +984,7 @@ bool ABC_mesh_topology_changed( { AbcObjectReader *abc_reader = get_abc_reader(reader, ob, err_str); if (abc_reader == NULL) { - return NULL; + return false; } ISampleSelector sample_sel = sample_selector_for_time(time); diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c index 29e933e26df..e9e92f7a1e2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c @@ -149,7 +149,7 @@ static void deformStroke(GpencilModifierData *md, if (mmd->flag & GP_THICK_NORMALIZE) { if (gps_has_unaffected_points) { /* Clamp value for very weird situations when stroke thickness can be zero. */ - CLAMP_MIN(gps->thickness, 0.001f); + CLAMP_MIN(gps->thickness, 1); /* Calculate pressure value to match the width of strokes with reset thickness and 1.0 * pressure. */ pt->pressure = (float)mmd->thickness / (float)gps->thickness; |