Tamito Kajiyama 3197796cf7 Merged changes in the trunk up to revision 42425. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

2011-12-05 02:12:49 +00:00

build_files

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

doc

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

extern

Fix warning for redefinition of __MSVCRT_VERSION__

2011-12-04 14:47:21 +00:00

intern

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

release

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

source

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

CMakeLists.txt

Enables vc 2010 boost libraries for cmake

2011-12-03 01:12:57 +00:00

COPYING

== docs ==

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

GNUmakefile

minor changes

2011-11-23 17:14:29 +00:00

SConstruct

Cycles

2011-12-01 16:33:21 +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%