From 28cc934bb937c8430a73752c19e0eee0e501981f Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Mon, 18 May 2015 09:51:09 -0400 Subject: [PATCH] Fix overlapping merges --- code/OptimizeMeshes.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp index 1e33f7356..870369315 100644 --- a/code/OptimizeMeshes.cpp +++ b/code/OptimizeMeshes.cpp @@ -61,7 +61,6 @@ static const unsigned int DeadBeef = 0xdeadbeef; // Constructor to be privately used by Importer OptimizeMeshesProcess::OptimizeMeshesProcess() : mScene() - , mesh() , pts(false) , max_verts( NotSet ) , max_faces( NotSet ) {