Campbell Barton a14fc54702 svn merge ^/trunk/blender -r49333:49361

2012-07-29 18:48:34 +00:00

..

include

svn merge ^/trunk/blender -r48986:48991

2012-07-17 09:58:20 +00:00

raytrace

add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these).

2012-07-29 18:14:20 +00:00

source

svn merge ^/trunk/blender -r49333:49361

2012-07-29 18:48:34 +00:00