blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanp: fix compiler warnings

This commit is contained in:
Brecht Van Lommel 2019-08-26 11:20:52 +02:00
parent fd52dc58dd
commit 2778754925
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extern/glew/CMakeLists.txt vendored
View File

@ -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
)

7
extern/lzma/CMakeLists.txt vendored
View File

@ -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
.
)

8
source/blender/alembic/intern/abc_mesh.h
View File

@ -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;

2
source/blender/alembic/intern/alembic_capi.cc
View File

@ -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);

2
source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
View File

@ -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;