Tamito Kajiyama 3df52d4e19 Merged changes in the trunk up to revision 36092. ...

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

2011-04-11 00:09:56 +00:00

build_files

minor pep8 edits, also added 'test_pep8' & 'test_cmake' to the GNUmakefile for convenience.

2011-04-10 10:45:56 +00:00

doc

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

extern

eltopo cloth solver couldnt be enabled from cmake, also dont use globbing.

2011-04-10 05:43:34 +00:00

intern

Fix for [#26652] "Audio Muted" in Time Line Editor is not working

2011-04-10 22:40:37 +00:00

release

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

source

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

CMakeLists.txt

Use the same LLIBS set for cmake at Win64 platform as scons uses.

2011-04-10 14:44:57 +00:00

COPYING

== docs ==

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

GNUmakefile

- background job style cleanup.

2011-04-10 15:24:05 +00:00

SConstruct

Apply [#26044] Windows thumbnails and improved filetype registration

2011-03-29 13:00:03 +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%