Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: fix compiler warnings.

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-01-26 14:46:38 +01:00
parent 4b8b7c821d
commit 8d4c4775a0
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/bvh/bvh2.h
View File

@@ -52,7 +52,7 @@ protected:
virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
/* pack */
void pack_nodes(const BVHNode *root);
void pack_nodes(const BVHNode *root) override;
void pack_leaf(const BVHStackEntry& e,
const LeafNode *leaf);
@@ -81,7 +81,7 @@ protected:
uint visibility0, uint visibility1);
/* refit */
void refit_nodes();
void refit_nodes() override;
void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility);
};

4
intern/cycles/bvh/bvh4.h
View File

@@ -52,7 +52,7 @@ protected:
virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
/* pack */
void pack_nodes(const BVHNode *root);
void pack_nodes(const BVHNode *root) override;
void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf);
void pack_inner(const BVHStackEntry& e, const BVHStackEntry *en, int num);
@@ -81,7 +81,7 @@ protected:
const int num);
/* refit */
void refit_nodes();
void refit_nodes() override;
void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility);
};

4
intern/cycles/bvh/bvh8.h
View File

@@ -63,7 +63,7 @@ protected:
virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
/* pack */
void pack_nodes(const BVHNode *root);
void pack_nodes(const BVHNode *root) override;
void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf);
void pack_inner(const BVHStackEntry& e, const BVHStackEntry *en, int num);
@@ -92,7 +92,7 @@ protected:
const int num);
/* refit */
void refit_nodes();
void refit_nodes() override;
void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility);
};

1
source/blender/imbuf/intern/oiio/openimageio_api.cpp
View File

@@ -203,7 +203,6 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac
struct ImBuf *ibuf = NULL;
int width, height, components;
bool is_float, is_alpha;
TypeDesc typedesc;
int basesize;
char file_colorspace[IM_MAX_SPACE];