[Bf-committers] Miscellaneous patches

[Kester Maddock]

--Boundary-00=_FShx+dIXHhEBHZc
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi all,

Two more patches:
1.  Up the max amount of lamps supported by the renderer from 256 to 32766 
(requested by alltaken)
2.  Fix a memory issue detected with valgrind.

Kester
--Boundary-00=_FShx+dIXHhEBHZc
Content-Type: text/x-diff;
  charset="us-ascii";
  name="blender-maxlamp.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="blender-maxlamp.diff"

Index: source/blender/include/blendef.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/blendef.h,v
retrieving revision 1.13
diff -u -r1.13 blendef.h
--- source/blender/include/blendef.h	8 May 2003 16:24:48 -0000	1.13
+++ source/blender/include/blendef.h	17 May 2003 10:31:26 -0000
@@ -141,8 +141,8 @@
 /* **************** MAX ********************* */
 
 
-#define MAXLAMP		256
-/* max length material array, 16 because of bits in matfrom */
+#define MAXLAMP		32766
+/* max lengte material array, 16 vanwege bitjes in matfrom */
 #define MAXPICKBUF	2000
 #define MAXSEQ		32
 /*  in Image struct */
Index: source/blender/makesdna/DNA_lamp_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_lamp_types.h,v
retrieving revision 1.6
diff -u -r1.6 DNA_lamp_types.h
--- source/blender/makesdna/DNA_lamp_types.h	27 Apr 2003 11:55:09 -0000	1.6
+++ source/blender/makesdna/DNA_lamp_types.h	17 May 2003 10:31:26 -0000
@@ -91,7 +91,7 @@
 #define LAMAP_COL		1
 
 /* bit isolated... */
-#define MAXLAMP		256
+#define MAXLAMP		32766
 
 #endif
 

--Boundary-00=_FShx+dIXHhEBHZc
Content-Type: text/x-diff;
  charset="us-ascii";
  name="blender-valgrind1.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="blender-valgrind1.diff"

Index: source/blender/render/intern/source/shadbuf.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/shadbuf.c,v
retrieving revision 1.4
diff -u -r1.4 shadbuf.c
--- source/blender/render/intern/source/shadbuf.c	28 Apr 2003 11:25:42 -0000	1.4
+++ source/blender/render/intern/source/shadbuf.c	17 May 2003 10:38:56 -0000
@@ -374,7 +374,7 @@
 {
 	float temp;
 	int *rz, ofs;
-	int zsamp;
+	int zsamp = 0;
 	char *ct, *cz;
 
 	/* simpleclip */

--Boundary-00=_FShx+dIXHhEBHZc--