Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +00:00

build_files

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

doc

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

extern

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

intern

Integer socket support in Cycles. Int values are already supported natively in OSL, but were not used as actual ints on the SVM stack. This patch implements all the necessary functionality to support reading input values from RNA properties and convert between SHADER_SOCKET_INT and other types.

2012-10-20 13:11:45 +00:00

release

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

source

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

CMakeLists.txt

dont ise -Wuninitialized on gcc 4.2 and older, it gives annoying warnings.

2012-10-20 13:29:07 +00:00

COPYING

== docs ==

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

GNUmakefile

code cleanup: add check spelling osl

2012-10-17 01:53:29 +00:00

SConstruct

add option to build without blenders default avi codec.

2012-10-08 02:51:42 +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%