Merge branch 'master' of https://github.com/assimp/assimp

2017-03-11 22:13:48 +01:00
parent 43a3d2c539 4450d77312
commit bb7f387bcf
111 changed files with 338 additions and 333 deletions
--- a/code/ColladaExporter.cpp
+++ b/code/ColladaExporter.cpp
@@ -38,12 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */

-
-
 #ifndef ASSIMP_BUILD_NO_EXPORT
 #ifndef ASSIMP_BUILD_NO_COLLADA_EXPORTER
-#include "ColladaExporter.h"

+#include "ColladaExporter.h"
 #include "Bitmap.h"
 #include "fast_atof.h"
 #include "SceneCombiner.h"