Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +00:00

build_files

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00

doc

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

extern

Updated Carve bundling script and patches

2012-01-17 18:47:02 +00:00

intern

use property definitions more consistant with other addons in trunk. (no functional change)

2012-01-20 18:31:23 +00:00

release

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00

source

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00

CMakeLists.txt

OSX/Cmake: make bpy module work finally by linking against python3.2 framework

2012-01-16 20:10:38 +00:00

COPYING

== docs ==

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

GNUmakefile

minor changes

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

SConstruct

Compilation error when using mingw+scons

2012-01-17 10:32:17 +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%