Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

build_files

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

doc

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

extern

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

intern

Fix #33364: cycles tile rendering artifacts.

2012-11-30 18:55:04 +00:00

release

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

source

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00

CMakeLists.txt

we need 2.8.8 for cmake on mac - patch by Jens Verwiebe

2012-11-29 10:28:06 +00:00

COPYING

== docs ==

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

GNUmakefile

code cleanup: comment unused members of bmesh operator slots and some osl style edits.

2012-11-20 14:31:58 +00:00

SConstruct

OSX/scons: introducing and testing an unexported_symbols_list to prevent clashes, todo: cmake

2012-11-27 11:38:59 +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%