Merge pull request #1193 from asarium/fix/611

The-E · web-flow · commit fa90542b004e · 2017-02-07T17:32:56.000+01:00
Disable resizing for cubemaps
diff --git a/code/graphics/opengl/gropengltexture.cpp b/code/graphics/opengl/gropengltexture.cpp
@@ -904,7 +904,8 @@ int opengl_create_texture(int bitmap_handle, int bitmap_type, tcache_slot_opengl
 	}
 
 	if ( (Detail.hardware_textures < 4) && (bitmap_type != TCACHE_TYPE_AABITMAP) && (bitmap_type != TCACHE_TYPE_INTERFACE)
-			&& ((bitmap_type != TCACHE_TYPE_COMPRESSED) || ((bitmap_type == TCACHE_TYPE_COMPRESSED) && (max_levels > 1))) )
+		&& (bitmap_type != TCACHE_TYPE_CUBEMAP)
+		&& ((bitmap_type != TCACHE_TYPE_COMPRESSED) || ((bitmap_type == TCACHE_TYPE_COMPRESSED) && (max_levels > 1))) )
 	{
 		if (max_levels == 1) {
 			// if we are going to cull the size then we need to force a resize

Original file line number	Diff line number	Diff line change
`@@ -904,7 +904,8 @@ int opengl_create_texture(int bitmap_handle, int bitmap_type, tcache_slot_opengl`
`904`	`904`	`}`
`905`	`905`
`906`	`906`	`if ( (Detail.hardware_textures < 4) && (bitmap_type != TCACHE_TYPE_AABITMAP) && (bitmap_type != TCACHE_TYPE_INTERFACE)`
`907`		`- && ((bitmap_type != TCACHE_TYPE_COMPRESSED) \|\| ((bitmap_type == TCACHE_TYPE_COMPRESSED) && (max_levels > 1))) )`
	`907`	`+ && (bitmap_type != TCACHE_TYPE_CUBEMAP)`
	`908`	`+ && ((bitmap_type != TCACHE_TYPE_COMPRESSED) \|\| ((bitmap_type == TCACHE_TYPE_COMPRESSED) && (max_levels > 1))) )`
`908`	`909`	`{`
`909`	`910`	`if (max_levels == 1) {`
`910`	`911`	`// if we are going to cull the size then we need to force a resize`