Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.

2012-09-23 18:50:56 +00:00

build_files

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

doc

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

extern

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

intern

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

release

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

source

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

SConstruct

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

Description

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%