[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54982] trunk/blender/source/blender/ collada/collada_utils.cpp: partial revert of collada triangulation code due to problems on linux

Gaia Clary gaia.clary at machinimatrix.org
Sun Mar 3 00:42:03 CET 2013


Revision: 54982
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54982
Author:   gaiaclary
Date:     2013-03-02 23:42:03 +0000 (Sat, 02 Mar 2013)
Log Message:
-----------
partial revert of collada triangulation code due to problems on linux

Modified Paths:
--------------
    trunk/blender/source/blender/collada/collada_utils.cpp

Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp	2013-03-02 23:30:23 UTC (rev 54981)
+++ trunk/blender/source/blender/collada/collada_utils.cpp	2013-03-02 23:42:03 UTC (rev 54982)
@@ -35,6 +35,7 @@
 #include "collada_utils.h"
 
 extern "C" {
+
 #include "DNA_modifier_types.h"
 #include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
@@ -44,7 +45,6 @@
 
 #include "BLI_math.h"
 #include "BLI_linklist.h"
-
 #include "BKE_context.h"
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
@@ -56,8 +56,9 @@
 
 #include "WM_api.h" // XXX hrm, see if we can do without this
 #include "WM_types.h"
-#include "bmesh.h"
 
+//#include "bmesh.h"
+
 }
 
 float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index)
@@ -385,10 +386,13 @@
 void bc_triangulate_mesh(Mesh *me) {
 	bool use_beauty = false;
 	bool tag_only   = false;
-	 
+
+/*
 	BMesh *bm = BM_mesh_create(&bm_mesh_allocsize_default);
 	BM_mesh_bm_from_me(bm, me, FALSE, 0);
 	BM_mesh_triangulate(bm, use_beauty, tag_only, NULL, NULL);
 	BM_mesh_bm_to_me(bm, me, FALSE);
 	BM_mesh_free(bm);
+*/
+
 }




More information about the Bf-blender-cvs mailing list