2.5: merge with trunk, previous merge was only up to yesterday.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Nov 2008 22:03:11 +0000 (22:03 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 12 Nov 2008 22:03:11 +0000 (22:03 +0000)
commitb3c238e8bc4c38a8f2ba483be2d19c76d03d674c
treea86991622fa5582498612cf348d0de58af048a08
parentbdfe7d89e2f1292644577972c716931b4ce3c6c3
parent7e4db234cee71ead34ee81a12e27da4bd548eb4b
2.5: merge with trunk, previous merge was only up to yesterday.
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD
47 files changed:
SConstruct
config/win32-mingw-config.py
config/win32-vc-config.py
projectfiles_vc9/blender/nodes/nodes.vcproj
source/Makefile
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/texture.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/nodes/Makefile
source/blender/nodes/SConscript
source/blender/nodes/TEX_node.h
source/blender/nodes/intern/SHD_nodes/SHD_texture.c
source/blender/nodes/intern/SHD_util.c
source/blender/nodes/intern/TEX_nodes/Makefile
source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
source/blender/nodes/intern/TEX_nodes/TEX_checker.c
source/blender/nodes/intern/TEX_nodes/TEX_curves.c
source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
source/blender/nodes/intern/TEX_nodes/TEX_image.c
source/blender/nodes/intern/TEX_nodes/TEX_invert.c
source/blender/nodes/intern/TEX_nodes/TEX_math.c
source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
source/blender/nodes/intern/TEX_nodes/TEX_output.c
source/blender/nodes/intern/TEX_nodes/TEX_proc.c
source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
source/blender/nodes/intern/TEX_nodes/TEX_texture.c
source/blender/nodes/intern/TEX_nodes/TEX_translate.c
source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
source/blender/nodes/intern/TEX_util.c
source/blender/nodes/intern/TEX_util.h
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/pixelshading.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pixelshading.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/texture.c
tools/Blender.py
tools/btools.py