Arystanbek Dyussenov fa0041de8d Fixed support for building without collada (scons and cmake). Only tested scons. ...

Re-enabled collada code building by default in cmake. Realized this should be off only in trunk.

2009-10-25 07:51:40 +00:00

..

blender

Fixed support for building without collada (scons and cmake). Only tested scons.

2009-10-25 07:51:40 +00:00

blenderplayer

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

creator

Merge from trunk -r 23000:23968.

2009-10-25 06:53:04 +00:00

darwin

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

gameengine

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

icons

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

kernel

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

CMakeLists.txt

Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (svn status output: http://www.pasteall.org/7887).

2009-09-15 18:01:18 +00:00

Makefile

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_compile.mk

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_definitions.mk

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_link.mk

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00

nan_subdirs.mk

Makefile updates for Blender 2.5 (from GSR)

2009-03-19 01:50:45 +00:00

nan_warn.mk

Update condition checks to match user definable CC and CCC.

2009-09-20 20:21:01 +00:00

SConscript

Merge from trunk -r 22040:23000.

2009-10-19 16:20:12 +00:00