Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

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

2011-03-13 02:10:39 +00:00

build_files

cmake, search $HOME/py32 for python now too.

2011-03-12 04:39:43 +00:00

doc

Merged changes in the trunk up to revision 35367.

2011-03-06 12:13:32 +00:00

extern

quiet stricter compiler warnings/errors.

2011-03-12 23:41:57 +00:00

intern

Some explicit casts to silence warnings (unsafe to mix int and bool in comparisons).

2011-03-11 22:06:18 +00:00

release

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

source

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

CMakeLists.txt

builder reports MSVC was setting stack size to 2gig.

2011-03-12 04:31:28 +00:00

COPYING

== docs ==

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

GNUmakefile

update 'make' GNUmakefile stub to run 'make install'

2011-03-06 12:04:59 +00:00

SConstruct

Check the os.environ at the start of the build process.

2011-02-18 09:39: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%