Tamito Kajiyama 17ee056fc6 Merged changes in the trunk up to revision 37539. ...

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

Also fixed an inconsistent conflict resolution in the last commit with
regard to release/scripts/startup/bl_ui/properties_render.py.  This
problem resulted in empty menus in the GUI.

2011-06-16 05:50:13 +00:00

build_files

Merged changes in the trunk up to revision 37539.

2011-06-16 05:50:13 +00:00

doc

Merged changes in the trunk up to revision 37539.

2011-06-16 05:50:13 +00:00

extern

update to glew 1.6 from 1.5.8

2011-06-02 00:05:54 +00:00

intern

Elbeem / Fluidsim update:

2011-06-12 23:51:30 +00:00

release

Merged changes in the trunk up to revision 37539.

2011-06-16 05:50:13 +00:00

source

Merged changes in the trunk up to revision 37539.

2011-06-16 05:50:13 +00:00

CMakeLists.txt

use full library paths for openexr & msvc, also remove unneeded exr includes

2011-06-15 13:54:57 +00:00

COPYING

== docs ==

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

GNUmakefile

avoid cd'ing with the makefile stub

2011-06-06 16:00:32 +00:00

SConstruct

Shuffle some build code around to ensure debug builds on Windows actually run too.

2011-06-08 11:53:07 +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%