Commit: 8d4c4775a0a686e93fbaaf02057f8ab8ef4896c3
Author: Brecht Van Lommel
Date: Sat Jan 26 14:46:38 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB8d4c4775a0a686e93fbaaf02057f8ab8ef4896c3
Cleanup: fix compiler warnings.
===================================================================
M intern/cycles/bvh/bvh2.h
M intern/cycles/bvh/bvh4.h
M intern/cycles/bvh/bvh8.h
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
===================================================================
diff --git a/intern/cycles/bvh/bvh2.h b/intern/cycles/bvh/bvh2.h
index f38cdf5aca9..6afa6c21796 100644
--- a/intern/cycles/bvh/bvh2.h
+++ b/intern/cycles/bvh/bvh2.h
@@ -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);
};
diff --git a/intern/cycles/bvh/bvh4.h b/intern/cycles/bvh/bvh4.h
index 2a2a466c767..caa0e2c8182 100644
--- a/intern/cycles/bvh/bvh4.h
+++ b/intern/cycles/bvh/bvh4.h
@@ -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);
};
diff --git a/intern/cycles/bvh/bvh8.h b/intern/cycles/bvh/bvh8.h
index 84f82538c0f..277e2f2d653 100644
--- a/intern/cycles/bvh/bvh8.h
+++ b/intern/cycles/bvh/bvh8.h
@@ -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);
};
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
index 34d5cccac84..7c64fdfc9df 100644
--- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp
+++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp
@@ -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];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
