Tamito Kajiyama dd8e836067 Merged changes in the trunk up to revision 51853. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!

2012-11-04 02:22:56 +00:00

..

buildbot

Buildbot: hopefully fix for missed sound on glibc2.11 slaves

2012-10-29 18:03:32 +00:00

cmake

remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used.

2012-10-22 02:39:26 +00:00

package_spec

Have CPack rpm builder install the colorspace folder too

2012-10-04 15:14:15 +00:00

scons

Merged changes in the trunk up to revision 51853.

2012-11-04 02:22:56 +00:00