home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'NINE78/master' into test

Browse Source
This commit is contained in:
Mr.doob
2011-05-28 23:39:53 +01:00
parent 18f7859974 778672f651
commit fdf0c2f558
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderers/WebGLRenderer.js
+11 -5
View File
@@ -698,7 +698,12 @@ THREE.WebGLRenderer = function ( parameters ) {
for ( a in materials[ m ].attributes ) {
attribute = materials[ m ].attributes[ a ];
// Do a shallow copy of the attribute object so different geometryGroup chunks use different
// attribute buffers which are correctly indexed in the setMeshBuffers function
attribute = {};
for (prop in materials[ m ].attributes[ a ] ) {
attribute [ prop ] = materials[ m ].attributes[ a ][ prop ];
}
if( !attribute.__webglInitialized || attribute.createUniqueBuffers ) {
@@ -2566,7 +2571,8 @@ THREE.WebGLRenderer = function ( parameters ) {
// custom attributes
/* if ( geometryGroup.__webglCustomAttributes ) {
// Use the per-geometryGroup custom attribute arrays which are setup in initMeshBuffers
if ( geometryGroup.__webglCustomAttributes ) {
for( a in geometryGroup.__webglCustomAttributes ) {
@@ -2581,10 +2587,10 @@ THREE.WebGLRenderer = function ( parameters ) {
}
}*/
}
if ( material.attributes ) {
/* if ( material.attributes ) {
for( a in material.attributes ) {
@@ -2603,7 +2609,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
}
}*/