Merge pull request #6805 from tschw/Blender_exporter_offsets

Blender exporter: Changed .offsets to .drawcalls.

src/core/BufferGeometry.js

@@ -1069,7 +1069,7 @@ THREE.BufferGeometry.prototype = {
 		data.data = { attributes: {} };
 
 		var attributes = this.attributes;
-		var offsets = this.drawcalls;
+		var drawcalls = this.drawcalls;
 		var boundingSphere = this.boundingSphere;
 
 		for ( var key in attributes ) {
@@ -1086,9 +1086,9 @@ THREE.BufferGeometry.prototype = {
 
 		}
 
-		if ( offsets.length > 0 ) {
+		if ( drawcalls.length > 0 ) {
 
-			data.data.offsets = JSON.parse( JSON.stringify( offsets ) );
+			data.data.drawcalls = JSON.parse( JSON.stringify( drawcalls ) );
 
 		}
 

src/loaders/BufferGeometryLoader.js

@@ -47,18 +47,16 @@ THREE.BufferGeometryLoader.prototype = {
 
 		}
 
-		var offsets = json.data.offsets;
+		var drawcalls = json.data.drawcalls || json.data.offsets;
 
-		if ( offsets !== undefined ) {
+		if ( drawcalls !== undefined ) {
 
-			var offsetsArray = JSON.parse( JSON.stringify( offsets ) );
+			for ( var i = 0, n = drawcalls.length; i !== n; ++ i ) {
 
-			for ( var i = 0; i < offsetsArray.length; i ++ ) {
-
-				var offset = offsetsArray[i];
-				var indexStart = offset.start;
-				var indexCount = offset.count;
-				var indexOffset = offset.index;
+				var drawcall = drawcallsArray[i];
+				var indexStart = drawcall.start;
+				var indexCount = drawcall.count;
+				var indexOffset = drawcall.index;
 
 				geometry.addDrawcall( indexStart, indexCount, indexOffset );
 

utils/exporters/blender/addons/io_three/constants.py

@@ -69,7 +69,7 @@ COLORS = 'colors'
 MIX_COLORS = 'mixColors'
 EXTRA_VGROUPS = 'extraVertexGroups'
 INDEX = 'index'
-DRAW_CALLS = 'offsets'
+DRAW_CALLS = 'drawcalls'
 DC_START = 'start'
 DC_COUNT = 'count'
 DC_INDEX = 'index'