[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53114] trunk/blender/source/blender/gpu/ intern/gpu_buffers.c: fix [#33598] Regression in 2.65 while opening a 2. 64 file

[Campbell Barton]

Revision: 53114
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53114
Author:   campbellbarton
Date:     2012-12-18 11:17:20 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
fix [#33598] Regression in 2.65 while opening a 2.64 file

VBO's were using a material limit half the size of the rest of blender.

Modified Paths:
--------------
    trunk/blender/source/blender/gpu/intern/gpu_buffers.c

Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2012-12-18 10:57:46 UTC (rev 53113)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c	2012-12-18 11:17:20 UTC (rev 53114)
@@ -45,6 +45,7 @@
 #include "BLI_threads.h"
 
 #include "DNA_meshdata_types.h"
+#include "DNA_material_types.h"
 
 #include "BKE_ccg.h"
 #include "BKE_DerivedMesh.h"
@@ -66,8 +67,8 @@
 
 #define MAX_GPU_ATTRIB_DATA 32
 
-/* material number is an 16-bit short and the range of short is from -16383 to 16383 (assume material number is non-negative) */
-#define MAX_MATERIALS 16384
+/* material number is an 16-bit signed short and the range (assume material number is non-negative) */
+#define MAX_MATERIALS MAXMAT
 
 /* -1 - undefined, 0 - vertex arrays, 1 - VBOs */
 static int useVBOs = -1;