Brecht Van Lommel 0ed2309b4d Cycles: fix crash loading existing files, forgot to merge over this line.

2011-11-08 18:49:12 +00:00

..

blender

Cycles: fix crash loading existing files, forgot to merge over this line.

2011-11-08 18:49:12 +00:00

blenderplayer

Texturing: texture and 3d view draw type changes, these should only have any

2011-11-08 13:07:16 +00:00

creator

Cycles: svn merge -r41613:41627 ^/trunk/blender

2011-11-07 17:13:32 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

Cycles: svn merge -r41531:41613 ^/trunk/blender

2011-11-07 15:23:08 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

Cycles: svn merge -r41225:41232 ^/trunk/blender

2011-10-24 22:32:00 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00