Biiig commit! Thanks to 2-3 weeks of cvs freeze...

Render:
- New; support for dual CPU render (SDL thread)
  Currently only works with alternating scanlines, but gives excellent
  performance. For both normal render as unified implemented.
  Note the "mutex" locks on z-transp buffer render and imbuf loads.
- This has been made possible by major cleanups in render code, especially
  getting rid of globals (example Tin Tr Tg Tb Ta for textures) or struct
  OSA or using Materials or Texture data to write to.
- Made normal render fully 4x32 floats too, and removed all old optimizes
  with chars or shorts.
- Made normal render and unified render use same code for sky and halo
  render, giving equal (and better) results for halo render. Old render
  now also uses PostProcess options (brightness, mul, gamma)
- Added option ("FBuf") in F10 Output Panel, this keeps a 4x32 bits buffer
  after render. Using PostProcess menu you will note an immediate re-
  display of image too (32 bits RGBA)
- Added "Hue" and "Saturation" sliders to PostProcess options

- Render module is still not having a "nice" API, but amount of dependencies
  went down a lot. Next todo: remove abusive "previewrender" code.
  The last main global in Render (struct Render) now can be re-used for fully
  controlling a render, to allow multiple "instances" of render to open.

- Renderwindow now displays a smal bar on top with the stats, and keeps the
  stats after render too. Including "spare" page support.
  Not only easier visible that way, but also to remove the awkward code that
  was drawing stats in the Info header (extreme slow on some ATIs too)

- Cleaned up blendef.h and BKE_utildefines.h, these two had overlapping
  defines.

- I might have forgotten stuff... and will write a nice doc on the architecture!

3 files changed, 9 insertions, 5 deletions

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index fa2447a12f4..b5adabbdc15 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -93,7 +93,6 @@ typedef struct Material {
 	
 	struct MTex *mtex[10];
 	struct Ipo *ipo;
-	struct Material *ren;
 	
 	/* dynamic properties */
 	float friction, fh, reflect;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 36dbd75d741..04aa96c9d1f 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -178,6 +178,8 @@ typedef struct RenderData {
 	 * 14: motion blur
 	 * 15: use unified renderer for this pic
 	 * 16: enable raytracing
+	 * 17: gauss sampling for subpixels
+	 * 18: keep float buffer after render
 	 */
 	int mode;
 
@@ -208,9 +210,9 @@ typedef struct RenderData {
 	 * The gamma for the normal rendering. Used when doing
 	 * oversampling, to correctly blend subpixels to pixels.  */
 	float gamma, gauss;
-	/** post-production settings. Don't really belong here */
-	float postmul, postgamma, postadd, postigamma;
-
+	/** post-production settings. */
+	float postmul, postgamma, postadd, postigamma, posthue, postsat;
+	
 	/* Dither noise intensity */
 	float dither_intensity;
 	float pad_dither;
@@ -298,6 +300,8 @@ typedef struct Scene {
 #define R_UNIFIED       0x8000
 #define R_RAYTRACE      0x10000
 #define R_GAUSS      	0x20000
+#define R_FBUF			0x40000
+#define R_THREADS		0x80000
 
 /* yafray: renderer flag (not only exclusive to yafray) */
 #define R_INTERN	0
@@ -347,6 +351,7 @@ typedef struct Scene {
 #define R_LAMPHALO		8
 #define R_RENDERING		16
 #define R_ANIMRENDER	32
+#define R_REDRAW_PRV	64
 
 /* vlakren->flag (vlak = face in dutch) char!!! */
 #define R_SMOOTH		1
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 634d9e887eb..cd6a0b8bbdb 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -151,7 +151,7 @@ typedef struct Tex {
 	short extend, len;
 	float checkerdist, nabla;
 	short frames, offset, sfra, fie_ima;
-	float norfac, *nor;
+	float norfac;
 	
 	struct Ipo *ipo;
 	struct Image *ima;