Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +00:00

build_files

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

doc

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

extern

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

intern

Fix #33152: cycles SVM crash with certain shader nodes setups where closures would

2012-11-24 14:50:21 +00:00

release

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

source

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

CMakeLists.txt

Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe.

2012-11-21 22:28:15 +00:00

COPYING

== docs ==

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

GNUmakefile

code cleanup: comment unused members of bmesh operator slots and some osl style edits.

2012-11-20 14:31:58 +00:00

SConstruct

OSX/scons/osl: un-hardcode the osl libpath

2012-11-19 17:15:33 +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%