const global objects must have a defaulted constructor.

Make sure that functions are defined before used in templates.

4 files changed, 60 insertions, 1 deletions

diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo
index 89a0eb910ed..6c2f79b0ff4 100644
--- a/graphics/blender/distinfo
+++ b/graphics/blender/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2012/07/03 18:10:03 joerg Exp $
+$NetBSD: distinfo,v 1.32 2012/10/20 22:10:18 joerg Exp $
 
 SHA1 (blender-2.49b.tar.gz) = 43f71e7de4efe79c518d45f4b5a04e03c28d5fc5
 RMD160 (blender-2.49b.tar.gz) = 5b641de7b41af5e4186c9721b66eddc6870f9fbc
@@ -12,7 +12,10 @@ SHA1 (patch-aj) = 59c935bc84101e3a57af5231d6f1153897bbbb03
 SHA1 (patch-ak) = 98c93b7ee12e60aff0d8890cd1cdc7213515d270
 SHA1 (patch-al) = 8589d359484351766bfb99e58debf075bebbfd66
 SHA1 (patch-am) = 6da69ace1e9da706124621f6721fd4d4f804cc6f
+SHA1 (patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h) = 00d32551c63b68bedfab73f88e8b26a9a3a2adf3
 SHA1 (patch-extern_solid_include_MT_Quaternion.h) = 7dda79b1ec874268f7cf38d846e7ad30aa8c2d88
+SHA1 (patch-extern_solid_src_complex_DT__BBoxTree.h) = dbf724c1933c756fd61c68bf1acccee569b817d6
+SHA1 (patch-extern_solid_src_complex_DT__Complex.cpp) = 7d53b7ceaedd0d1c467718037fb63395cbeb4559
 SHA1 (patch-intern_elbeem_intern_ntl__vector3dim.h) = 3aabccfa0040e43829841270f32e0263bfa236f1
 SHA1 (patch-intern_elbeem_intern_utilities.h) = 3d5a158b0c2fdaddc5897a3e8aa41a090c3a514c
 SHA1 (patch-source_blender_python_BPY__interface.c) = 9cc72c2fea93e9bfdf9b2f9cc147be90c044d53d
diff --git a/graphics/blender/patches/patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h b/graphics/blender/patches/patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h
new file mode 100644
index 00000000000..7ffcf16df73
--- /dev/null
+++ b/graphics/blender/patches/patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-extern_bullet2_src_BulletSoftBody_btSoftBodyInternals.h,v 1.1 2012/10/20 22:10:18 joerg Exp $
+
+Some instanciations don't have a user-defined default constructor,
+so make sure to use plain initialisation.
+
+--- extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h.orig	2012-10-20 10:52:46.000000000 +0000
++++ extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+@@ -171,7 +171,7 @@ public:

+ template <typename T>

+ static inline void			ZeroInitialize(T& value)

+ {

+-	static const T	zerodummy;

++	static T	zerodummy;

+ 	value=zerodummy;

+ }

+ //

diff --git a/graphics/blender/patches/patch-extern_solid_src_complex_DT__BBoxTree.h b/graphics/blender/patches/patch-extern_solid_src_complex_DT__BBoxTree.h
new file mode 100644
index 00000000000..d29bce9aaae
--- /dev/null
+++ b/graphics/blender/patches/patch-extern_solid_src_complex_DT__BBoxTree.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-extern_solid_src_complex_DT__BBoxTree.h,v 1.1 2012/10/20 22:10:18 joerg Exp $
+
+--- extern/solid/src/complex/DT_BBoxTree.h.orig	2012-10-20 10:46:59.000000000 +0000
++++ extern/solid/src/complex/DT_BBoxTree.h
+@@ -95,6 +95,15 @@ public:
+     const Shape         *m_leaves;
+ };
+ 
++inline DT_CBox computeCBox(MT_Scalar margin, const MT_Transform& xform) 
++{
++    const MT_Matrix3x3& basis = xform.getBasis();
++    return DT_CBox(MT_Point3(MT_Scalar(0.0), MT_Scalar(0.0), MT_Scalar(0.0)), 
++                   MT_Vector3(basis[0].length() * margin, 
++                              basis[1].length() * margin, 
++                              basis[2].length() * margin));
++} 
++
+ template <typename Shape1, typename Shape2>
+ class DT_ObjectData : public DT_RootData<Shape1> {
+ public:
diff --git a/graphics/blender/patches/patch-extern_solid_src_complex_DT__Complex.cpp b/graphics/blender/patches/patch-extern_solid_src_complex_DT__Complex.cpp
new file mode 100644
index 00000000000..72ef076af26
--- /dev/null
+++ b/graphics/blender/patches/patch-extern_solid_src_complex_DT__Complex.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-extern_solid_src_complex_DT__Complex.cpp,v 1.1 2012/10/20 22:10:18 joerg Exp $
+
+--- extern/solid/src/complex/DT_Complex.cpp.orig	2012-10-20 10:47:02.000000000 +0000
++++ extern/solid/src/complex/DT_Complex.cpp
+@@ -123,15 +123,6 @@ inline DT_CBox computeCBox(const DT_Conv
+     return DT_CBox(p->bbox()); 
+ }
+ 
+-inline DT_CBox computeCBox(MT_Scalar margin, const MT_Transform& xform) 
+-{
+-    const MT_Matrix3x3& basis = xform.getBasis();
+-    return DT_CBox(MT_Point3(MT_Scalar(0.0), MT_Scalar(0.0), MT_Scalar(0.0)), 
+-                   MT_Vector3(basis[0].length() * margin, 
+-                              basis[1].length() * margin, 
+-                              basis[2].length() * margin));
+-} 
+-
+ void DT_Complex::refit()
+ {
+     DT_RootData<const DT_Convex *> rd(m_nodes, m_leaves);