diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
| commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
| tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/render/intern/raytrace/rayobject_vbvh.cpp | |
| parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
| parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) | |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/render/intern/raytrace/rayobject_vbvh.cpp')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject_vbvh.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp index 9e7075438cb..85c9d0d402f 100644 --- a/source/blender/render/intern/raytrace/rayobject_vbvh.cpp +++ b/source/blender/render/intern/raytrace/rayobject_vbvh.cpp @@ -152,7 +152,8 @@ void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *UNUSED(min), float *UNUSED(m } } -void bfree(VBVHTree *tree) +#if 0 /* UNUSED */ +static void bfree(VBVHTree *tree) { if (tot_pushup + tot_pushdown + tot_hints + tot_moves) { if (G.debug & G_DEBUG) { @@ -169,6 +170,7 @@ void bfree(VBVHTree *tree) } bvh_free(tree); } +#endif /* the cast to pointer function is needed to workarround gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11407 */ template<class Tree, int STACK_SIZE> |