Browse Source

Merge remote-tracking branch 'CraigFeldspar/geometrycouting' into dev

Mr.doob 12 years ago
parent
commit
3391974cd2
1 changed files with 8 additions and 4 deletions
  1. 8 4
      src/renderers/WebGLRenderer.js

+ 8 - 4
src/renderers/WebGLRenderer.js

@@ -517,8 +517,6 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 		deallocateGeometry( geometry );
 		deallocateGeometry( geometry );
 
 
-		_this.info.memory.geometries --;
-
 	};
 	};
 
 
 	var onTextureDispose = function ( event ) {
 	var onTextureDispose = function ( event ) {
@@ -586,6 +584,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 		}
 		}
 
 
+		_this.info.memory.geometries --;
+
 	};
 	};
 
 
 	var deallocateGeometry = function ( geometry ) {
 	var deallocateGeometry = function ( geometry ) {
@@ -606,6 +606,8 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 			}
 			}
 
 
+			_this.info.memory.geometries --;
+
 		} else {
 		} else {
 
 
 			if ( geometry.geometryGroups !== undefined ) {
 			if ( geometry.geometryGroups !== undefined ) {
@@ -638,9 +640,11 @@ THREE.WebGLRenderer = function ( parameters ) {
 
 
 				}
 				}
 
 
-			}
+			} else {
 
 
-			deleteBuffers( geometry );
+				deleteBuffers( geometry );
+
+			}
 
 
 		}
 		}