Tamito Kajiyama feccbaabbd Merged changes in the trunk up to revision 53584. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup

2013-01-05 22:24:05 +00:00

..

binreloc

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

bullet2

Hi there, it has been a while, just curious if my SVN account still works :)

2012-12-15 01:01:35 +00:00

carve

Fix/workaround for carve aborts on windows

2012-11-05 11:34:53 +00:00

colamd

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

Eigen3

Update to stable Eigen 3.1.1

2012-10-15 16:29:23 +00:00

glew

OSX: substitute all MAC_OS_X_VERSION defines with MAC_OS_X_VERSION_MIN_REQUIRED macros, to get more reliable version (api) covering

2012-11-06 15:19:49 +00:00

libmv

Merged changes in the trunk up to revision 53280.

2012-12-23 00:23:11 +00:00

libopenjpeg

add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.

2012-06-23 14:23:44 +00:00

libredcode

style cleanup

2012-05-27 00:36:50 +00:00

lzma

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

lzo

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

rangetree

Import the RangeTree library into extern

2012-12-30 18:20:52 +00:00

recastnavigation

style cleanup

2012-10-20 18:46:57 +00:00

xdnd

Fix #33192: Opening Blender breaks drag-and-drop support on the KDE desktop

2012-11-15 20:50:48 +00:00

CMakeLists.txt

add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.

2013-01-03 00:23:52 +00:00

SConscript

Import the RangeTree library into extern

2012-12-30 18:20:52 +00:00