Cleanup: fix compiler warnings on macOS / clang.
This commit is contained in:
parent
bf75b24818
commit
54aa834b7d
|
@ -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)
|
||||
{}
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -38,7 +38,6 @@ bool AnimationExporter::exportAnimations(Scene *sce)
|
|||
{
|
||||
bool has_animations = hasAnimations(sce);
|
||||
if (has_animations) {
|
||||
this->depsgraph = depsgraph;
|
||||
this->scene = sce;
|
||||
|
||||
openLibrary();
|
||||
|
|
|
@ -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" {
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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[];
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue