Arystanbek Dyussenov 1f863d0122 COLLADA branch: merge from trunk -r 25745:26429. ...

scons+vc build crashes on Blender start when BF_COLLADA is on, don't know why this happens.

Merging from trunk to get working vc project files, then will try to debug and locate the problem.

2010-01-30 14:12:51 +00:00

..

blender

COLLADA branch: merge from trunk -r 25745:26429.

2010-01-30 14:12:51 +00:00

blenderplayer

Removing duplicate bad level call entries, patch from Richard Sanger, thanks

2010-01-30 00:47:41 +00:00

creator

workaround for running python scripts before the contexts values are set.

2010-01-27 11:18:55 +00:00

darwin

OS X Makefiles:

2010-01-03 20:35:13 +00:00

gameengine

same fix from 2.4x r26392.

2010-01-29 09:56:32 +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

Change order of linking slightly so things link.

2010-01-22 16:28:16 +00:00

nan_compile.mk

Drag and drop 2.5 integration! Finally, slashdot regulars can use

2010-01-26 18:18:21 +00:00

nan_definitions.mk

Drag and drop 2.5 integration! Finally, slashdot regulars can use

2010-01-26 18:18:21 +00:00

nan_link.mk

add OpenCOLLADA support to Makefiles

2010-01-10 09:11:48 +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