浏览代码

Merge pull request #402 from jdduke/disable_bmesh

Temporarily disable Blender BMesh conversion
Alexander Gessler 11 年之前
父节点
当前提交
b483be3069
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      code/BlenderLoader.cpp

+ 4 - 0
code/BlenderLoader.cpp

@@ -659,11 +659,15 @@ void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, co
 	ConversionData& conv_data, TempArray<std::vector,aiMesh>&  temp
 	ConversionData& conv_data, TempArray<std::vector,aiMesh>&  temp
 	) 
 	) 
 {
 {
+	// TODO: Resolve various problems with BMesh triangluation before re-enabling.
+	//       See issues #400, #373, #318  #315 and #132.
+#if defined(TODO_FIX_BMESH_CONVERSION)
 	BlenderBMeshConverter BMeshConverter( mesh );
 	BlenderBMeshConverter BMeshConverter( mesh );
 	if ( BMeshConverter.ContainsBMesh( ) )
 	if ( BMeshConverter.ContainsBMesh( ) )
 	{
 	{
 		mesh = BMeshConverter.TriangulateBMesh( );
 		mesh = BMeshConverter.TriangulateBMesh( );
 	}
 	}
+#endif
 
 
 	typedef std::pair<const int,size_t> MyPair;
 	typedef std::pair<const int,size_t> MyPair;
 	if ((!mesh->totface && !mesh->totloop) || !mesh->totvert) {
 	if ((!mesh->totface && !mesh->totloop) || !mesh->totvert) {