Merge pull request #2843 from tgfrerer/fix-critical-vbo-attribute-copy

fix critical issue w/ ofVbo shallow copies (custom attributes)
openframeworks · Mar 12, 2014 · bf4d6bc · bf4d6bc
2 parents 450f0f9 + f45736c
commit bf4d6bc
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/libs/openFrameworks/gl/ofVbo.cpp b/libs/openFrameworks/gl/ofVbo.cpp
@@ -181,6 +181,14 @@ ofVbo::ofVbo(const ofVbo & mom){
 		vaoChanged = mom.vaoChanged;
 	}
 
+	attributeIds = mom.attributeIds;
+	for (map<int, GLuint>::iterator it = attributeIds.begin(); it != attributeIds.end(); it++){
+		retain(it->second);
+	}
+
+	attributeNumCoords = mom.attributeNumCoords;
+	attributeStrides = mom.attributeStrides;
+	attributeSize = mom.attributeSize;
 
 	totalVerts = mom.totalVerts;
 	totalIndices = mom.totalIndices;
@@ -230,6 +238,15 @@ ofVbo & ofVbo::operator=(const ofVbo& mom){
 		vaoChanged = mom.vaoChanged;
 	}
 
+	attributeIds = mom.attributeIds;
+	for (map<int, GLuint>::iterator it = attributeIds.begin(); it != attributeIds.end(); it++){
+		retain(it->second);
+	}
+
+	attributeNumCoords = mom.attributeNumCoords;
+	attributeStrides = mom.attributeStrides;
+	attributeSize = mom.attributeSize;
+
 	totalVerts = mom.totalVerts;
 	totalIndices = mom.totalIndices;