Brecht Van Lommel b3c238e8bc 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

2008-11-12 22:03:11 +00:00

..

Makefile

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

SHD_camera.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_curves.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_dynamic.c

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00

SHD_geom.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_hueSatVal.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_invert.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_mapping.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_material.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_math.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_mixRgb.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_normal.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_output.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_rgb.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_sepcombRGB.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_squeeze.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_texture.c

2.5: merge with trunk, previous merge was only up to yesterday.

2008-11-12 22:03:11 +00:00

SHD_valToRgb.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_value.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00

SHD_vectMath.c

Merge of first part of changes from the apricot branch, especially

2008-09-04 20:51:28 +00:00