Tamito Kajiyama 76a211d809 Merged changes in the trunk up to revision 43219. ...

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c

2012-01-08 11:57:53 +00:00

build_files

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

doc

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

extern

add UNLIKELY / LIKELY util defines to help optimize iterators that are called a lot, only defined for gcc at the moment.

2011-12-29 01:46:58 +00:00

intern

Fix #29760: cycles border render issue on 32 bit linux.

2012-01-05 22:41:46 +00:00

release

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

source

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

CMakeLists.txt

use warnigns for all msvc configurations

2012-01-06 05:13:36 +00:00

COPYING

== docs ==

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

GNUmakefile

minor changes

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

SConstruct

option to build without remesh modifier for cmake and scons

2011-12-31 03:34:44 +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%