[Bf-blender-cvs] [54aa834b7d7] blender2.8: Cleanup: fix compiler warnings on macOS / clang.
Brecht Van Lommel
noreply at git.blender.org
Sat Apr 28 16:28:50 CEST 2018
Commit: 54aa834b7d7cd60544e5e56c962f64bd48a3c400
Author: Brecht Van Lommel
Date: Sat Apr 28 16:20:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB54aa834b7d7cd60544e5e56c962f64bd48a3c400
Cleanup: fix compiler warnings on macOS / clang.
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_exporter.h
M source/blender/alembic/intern/abc_transform.h
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/collada/AnimationExporter.cpp
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/object/object_bake.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 16c3f7f4e86..f06959762d5 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -168,7 +168,7 @@ static bool export_object(const ExportSettings * const settings, const Base * co
/* ************************************************************************** */
-AbcExporter::AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
+AbcExporter::AbcExporter(Main *bmain, Scene *scene,
Depsgraph *depsgraph,
const char *filename, ExportSettings &settings)
: m_bmain(bmain)
@@ -177,7 +177,6 @@ AbcExporter::AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
, m_trans_sampling_index(0)
, m_shape_sampling_index(0)
, m_scene(scene)
- , m_view_layer(view_layer)
, m_depsgraph(depsgraph)
, m_writer(NULL)
{}
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 0a32a28adca..c891824a114 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -93,7 +93,6 @@ class AbcExporter {
unsigned int m_trans_sampling_index, m_shape_sampling_index;
Scene *m_scene;
- ViewLayer *m_view_layer;
Depsgraph *m_depsgraph;
ArchiveWriter *m_writer;
@@ -105,8 +104,7 @@ class AbcExporter {
std::vector<AbcObjectWriter *> m_shapes;
public:
- AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
- Depsgraph *depsgraph,
+ AbcExporter(Main *bmain, Scene *scene, Depsgraph *depsgraph,
const char *filename, ExportSettings &settings);
~AbcExporter();
diff --git a/source/blender/alembic/intern/abc_transform.h b/source/blender/alembic/intern/abc_transform.h
index ce4b28ea236..91420b28f93 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -37,7 +37,6 @@ class AbcTransformWriter : public AbcObjectWriter {
Alembic::Abc::M44d m_matrix;
bool m_is_animated;
- bool m_visible;
bool m_inherits_xform;
public:
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 75b4063f3c4..35877f9f5a8 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -264,8 +264,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
try {
Scene *scene = data->scene;
- ViewLayer *view_layer = data->view_layer;
- AbcExporter exporter(data->bmain, scene, view_layer, data->depsgraph, data->filename, data->settings);
+ AbcExporter exporter(data->bmain, scene, data->depsgraph, data->filename, data->settings);
const int orig_frame = CFRA;
@@ -647,6 +646,7 @@ struct ImportJobData {
bool import_ok;
};
+#if 0
ABC_INLINE bool is_mesh_and_strands(const IObject &object)
{
bool has_mesh = false;
@@ -677,6 +677,7 @@ ABC_INLINE bool is_mesh_and_strands(const IObject &object)
return has_mesh && has_curve;
}
+#endif
static void import_startjob(void *user_data, short *stop, short *do_update, float *progress)
{
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 439f48897f6..a3e26451a38 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -38,7 +38,6 @@ bool AnimationExporter::exportAnimations(Scene *sce)
{
bool has_animations = hasAnimations(sce);
if (has_animations) {
- this->depsgraph = depsgraph;
this->scene = sce;
openLibrary();
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index baa87aefd64..0399882b659 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -30,6 +30,9 @@
* Implementation of Querying and Filtering API's
*/
+/* Silence warnings from copying deprecated fields. */
+#define DNA_DEPRECATED_ALLOW
+
#include "MEM_guardedalloc.h"
extern "C" {
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 3c827c14df5..193c1c38710 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -37,6 +37,9 @@
*/
#define NESTED_ID_NASTY_WORKAROUND
+/* Silence warnings from copying deprecated fields. */
+#define DNA_DEPRECATED_ALLOW
+
#include "intern/eval/deg_eval_copy_on_write.h"
#include <cstring>
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index d1924131eea..ae864539fb2 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -46,7 +46,7 @@ static struct {
struct GPUTexture *normal_buffer_tx; /* ref only, not alloced */
int next_object_id;
-} e_data = {NULL};
+} e_data = {{NULL}};
/* Shaders */
extern char datatoc_workbench_prepass_vert_glsl[];
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 2fca0bbbf79..9815d58764c 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1064,7 +1064,7 @@ static struct {
int calls; /* Number of calls batched together */
bool enabled;
float mat[4][4];
-} g_icon_draw_cache = {0};
+} g_icon_draw_cache = {{{{0}}}};
void UI_icon_draw_cache_begin(void)
{
diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c
index b10b35618fb..a8da5c038b4 100644
--- a/source/blender/editors/object/object_bake.c
+++ b/source/blender/editors/object/object_bake.c
@@ -616,7 +616,11 @@ static int bake_image_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
int result = OPERATOR_CANCELLED;
- BLI_assert(is_multires_bake(scene));
+ if (!is_multires_bake(scene)) {
+ BLI_assert(0);
+ return result;
+ }
+
result = multiresbake_image_exec_locked(C, op);
WM_event_add_notifier(C, NC_SCENE | ND_RENDER_RESULT, scene);
More information about the Bf-blender-cvs
mailing list