Browse Source

Merge remote-tracking branch 'origin/release/1.9.x'

rdb 8 years ago
parent
commit
36636aad81
1 changed files with 11 additions and 0 deletions
  1. 11 0
      panda/src/ode/odeTriMeshData.cxx

+ 11 - 0
panda/src/ode/odeTriMeshData.cxx

@@ -99,6 +99,7 @@ OdeTriMeshData(const NodePath& model, bool use_normals) :
 
 
   write_faces(odetrimeshdata_cat.debug());
   write_faces(odetrimeshdata_cat.debug());
 
 
+#ifdef dSINGLE
   if (!use_normals) {
   if (!use_normals) {
     build_single(_vertices, sizeof(StridedVertex), _num_vertices,
     build_single(_vertices, sizeof(StridedVertex), _num_vertices,
                  _faces, _num_faces * 3, sizeof(StridedTri));
                  _faces, _num_faces * 3, sizeof(StridedTri));
@@ -107,6 +108,16 @@ OdeTriMeshData(const NodePath& model, bool use_normals) :
                   _faces, _num_faces * 3, sizeof(StridedTri),
                   _faces, _num_faces * 3, sizeof(StridedTri),
                   _normals);
                   _normals);
   }
   }
+#else
+  if (!use_normals) {
+    build_double(_vertices, sizeof(StridedVertex), _num_vertices,
+                 _faces, _num_faces * 3, sizeof(StridedTri));
+  } else {
+    build_double1(_vertices, sizeof(StridedVertex), _num_vertices,
+                  _faces, _num_faces * 3, sizeof(StridedTri),
+                  _normals);
+  }
+#endif
 
 
   preprocess();
   preprocess();
 }
 }