Tamito Kajiyama 4c36a26af5 Merged changes in the trunk up to revision 45308. ...

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

2012-03-31 22:09:43 +00:00

build_files

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

doc

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

extern

Camera tracking refactoring:

2012-03-30 10:37:39 +00:00

intern

Fix #30551: cycles passes combining did not always give identical result combined

2012-03-28 12:18:12 +00:00

release

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

source

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

CMakeLists.txt

dont disable python when addons aren't found (addons are not needed for python to run)

2012-03-17 18:33:51 +00:00

COPYING

== docs ==

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

GNUmakefile

Spelling Cleanup

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

SConstruct

building without python works again, cleanup bmesh include paths (cmake and scons).

2012-03-08 03:25:53 +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%