Tamito Kajiyama 2585d52405 Merged changes in the trunk up to revision 46045. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

2012-04-29 00:59:04 +00:00

build_files

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00

doc

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00

extern

Camera tracking: support of tripod motion solving

2012-04-28 14:54:45 +00:00

intern

Hopefully a fix for [#31097] glibc error when playing sound using BGE

2012-04-28 13:37:44 +00:00

release

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00

source

Merged changes in the trunk up to revision 46045.

2012-04-29 00:59:04 +00:00

CMakeLists.txt

code cleanup: quiet msvc warnings

2012-04-27 03:01:27 +00:00

COPYING

== docs ==

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

GNUmakefile

Spelling Cleanup

2012-03-01 12:20:18 +00:00

SConstruct

Fix OIIO dll copying for win32-mingw

2012-04-26 08:04:11 +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%