Test fix

src/editor/BspRenderer.h

@@ -64,12 +64,13 @@ struct RenderEnt
 	vec3 angles; // support angles
 	int modelIdx; // -1 = point entity
 	EntCube* pointEntCube;
-	bool needAngles = false;
+	bool needAngles;
 	StudioModel* mdl;
 	Sprite* spr;
 	std::string mdlFileName;
 	RenderEnt() : modelMat4x4(mat4x4()), modelMat4x4_calc(mat4x4()), offset(vec3()), angles(vec3())
 	{
+		needAngles = false;
 		modelIdx = 0;
 		pointEntCube = NULL;
 		mdl = NULL;

src/editor/Renderer.cpp

@@ -2115,6 +2115,17 @@ Bsp* Renderer::getSelectedMap()
 		SelectedMap = mapRenderers[0]->map;
 	}
 
+	// TEMP DEBUG FOR CRASH DETECT
+	if (SelectedMap != NULL && !mapRenderers.size())
+	{
+		if (g_verbose)
+		{
+			print_log(PRINT_RED, "CRITICAL ERROR! BAD MAP POINTER!!\n");
+		}
+
+		SelectedMap = NULL;
+	}
+
 	return SelectedMap;
 }
 
@@ -2287,7 +2298,6 @@ void Renderer::addMap(Bsp* map)
 	{
 		deselectObject();
 		clearSelection();
-		selectMap(map);
 		if (map->ents.size())
 			pickInfo.SetSelectedEnt(0);
 		/*

src/gl/Texture.cpp

@@ -46,7 +46,7 @@ Texture::~Texture()
 	if (this->tex_owndata && data != NULL)
 		delete[] data;
 
-	auto it = std::remove(dumpTextures.begin(), dumpTextures.end(), this);
+	std::vector<Texture*>::iterator it = std::remove(dumpTextures.begin(), dumpTextures.end(), this);
 	if (it != dumpTextures.end())
 	{
 		dumpTextures.erase(it);

src/gl/VertexBuffer.cpp

@@ -3,8 +3,6 @@
 #include "util.h"
 #include <string.h>
 
-std::vector<VertexBuffer*> totalVertBuffers;
-
 VertexBuffer::VertexBuffer(ShaderProgram* shaderProgram, void* dat, int numVerts, int primitive)
 {
 	uploaded = false;
@@ -14,24 +12,10 @@ VertexBuffer::VertexBuffer(ShaderProgram* shaderProgram, void* dat, int numVerts
 	this->shaderProgram = shaderProgram;
 	this->primitive = primitive;
 	setData(dat, numVerts);
-	totalVertBuffers.push_back(this);
 }
 
 VertexBuffer::~VertexBuffer() {
 
-	auto it = std::find(totalVertBuffers.begin(), totalVertBuffers.end(), this);
-	if (it != totalVertBuffers.end())
-	{
-		totalVertBuffers.erase(it);
-	}
-	else
-	{
-		if (g_verbose)
-		{
-			print_log(PRINT_RED, "MISSING VERT BUFF IN TOTAL VERTS BUFF!\n");
-		}
-	}
-
 	deleteBuffer();
 	if (ownData && data) {
 		delete[] data;

src/gl/VertexBuffer.h

@@ -39,6 +39,4 @@ class VertexBuffer
 	GLuint vaoId;
 	// add attributes according to the attribute flags
 	void addAttributes(int attFlags);
-};
-
-extern std::vector<VertexBuffer*> totalVertBuffers;
+};