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.

2 files changed, 10 insertions, 1 deletions

diff --git a/source/blender/blenloader/intern/Makefile b/source/blender/blenloader/intern/Makefile
index bbda61c53f5..130e936886e 100644
--- a/source/blender/blenloader/intern/Makefile
+++ b/source/blender/blenloader/intern/Makefile
@@ -36,7 +36,7 @@ DIR = $(OCGDIR)/blender/$(LIBNAME)
 
 include nan_compile.mk
 
-CFLAGS += $(LEVEL_2_C_WARNINGS)
+# CFLAGS += $(LEVEL_2_C_WARNINGS)
 
 ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
     CFLAGS += -funsigned-char
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 5aecd18b231..ec051b0ec22 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3696,11 +3696,20 @@ static void do_versions(Main *main)
 	}	
 	if(main->versionfile <= 227) {
 		Scene *sce;
+		Material *ma;
 
 		for (sce= main->scene.first; sce; sce= sce->id.next) {
 			sce->audio.mixrate = 44100;
 			sce->audio.flag |= (AUDIO_SYNC + AUDIO_SCRUB);
 		}
+		for (ma= main->mat.first; ma; ma= ma->id.next) {
+			ma->refrac= 4.0;
+			ma->roughness= 0.5;
+			ma->param[0]= 0.5;
+			ma->param[1]= 0.1;
+			ma->param[2]= 0.1;
+			ma->param[3]= 0.05;
+		}
 	}	
 
 	/* don't forget to set version number in blender.c! */