Tamito Kajiyama 6cee7bb2b7 Merged changes in the trunk up to revision 52191. ...

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

2012-11-14 02:01:02 +00:00

build_files

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

doc

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

extern

Merged changes in the trunk up to revision 51985.

2012-11-07 22:12:19 +00:00

intern

avoid divide by zero in cycles progress calculation

2012-11-13 01:53:07 +00:00

release

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

source

Merged changes in the trunk up to revision 52191.

2012-11-14 02:01:02 +00:00

CMakeLists.txt

OSX/cmake: revert a testchange back for kaito

2012-11-12 10:51:29 +00:00

COPYING

== docs ==

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

GNUmakefile

code cleanup: spelling,

2012-11-12 07:33:01 +00:00

SConstruct

Fix to allow several include dirs for python under scons build system (needed with new py3.3 debian-like packages).

2012-11-12 18:31:15 +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%