WARNING: with makefiles I could not get a stable blender compiled.

         do a make clean in source/blender/ to be sure!

- Included the new shaders from Cessen... well, only the shader calls
  themselves. To make sure the shaders work I nicely integrated it

- MaterialButtons: layout changed a bit, but still resembles the old
  layout. The 'shader' options now are located together.

- Shaders are separated in 'diffuse' and 'specular'. You can combine them
  freely.

- diffuse Lambert: old shader
  diffuse Oren Nayar: new shader, gives sandy/silky/skinny material well
  diffuse Toon: for cartoon render

- specular Phong: new spec, traditional 70ies spec
  specular CookTorr: a reduced version of cook torrance shading, does
                     off specular peak well
  specular Blinn: new spec, same features as CookTorr, but with extra
                  'refraction' setting
  specular Toon: new spec for cartoon render

- default blender starts with settings that render compatible!

- works in shaded view and preview-render

- works in unified render

Further little changes:

- removed paranoia compile warnings from render/loader/blenlib

- and the warnings at files I worked at were removed.

1 files changed, 15 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 3789a296120..36b3e811953 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -69,7 +69,10 @@ typedef struct Material {
 	char rgbsel, texact, pr_type, septex;
 	short pr_back, pr_lamp;
 
-	int pad1;
+	/* shaders */
+	short diff_shader, spec_shader;
+	float roughness, refrac;
+	float param[4];		/* size, smooth, size, smooth, for toonshader */
 	short texco, mapto;
 	
 	struct MTex *mtex[8];
@@ -120,6 +123,17 @@ typedef struct Material {
 #define MA_HALO_SHADE	0x4000
 #define MA_HALO_FLARE	0x8000
 
+/* diff_shader */
+#define MA_DIFF_LAMBERT		0
+#define MA_DIFF_ORENNAYAR	1
+#define MA_DIFF_TOON		2
+
+/* spec_shader */
+#define MA_SPEC_COOKTORR	0
+#define MA_SPEC_PHONG		1
+#define MA_SPEC_BLINN		2
+#define MA_SPEC_TOON		3
+
 /* dynamode */
 #define MA_DRAW_DYNABUTS    1
 #define MA_FH_NOR	        2