svn merge -r 17502:18705 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 28 Jan 2009 00:43:46 +0000 (00:43 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 28 Jan 2009 00:43:46 +0000 (00:43 +0000)
commit561a9b3d4c20458c6d62de9f7f58a3725d3b0fd4
tree0c404081ea6bc1899571693e7943bd872d9992b6
parent1ed26fffb88ffcf70aa62c65964cc98348712b9d
parent7eae2080f23446054d0a7a3f30f8dd6c4969d1fa
svn merge -r 17502:18705 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/effect.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/include/butspace.h
source/blender/render/intern/source/occlusion.c
source/blender/render/intern/source/shadeinput.c