Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

blender

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

blenderplayer

Todo issue: sculpting on deformed mesh

2011-01-31 20:02:51 +00:00

creator

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

darwin

remove nan-makefiles

2011-01-30 15:29:22 +00:00

gameengine

Fix #26064: blenderplayer is broken

2011-02-13 10:28:40 +00:00

icons

remove nan-makefiles

2011-01-30 15:29:22 +00:00

kernel

remove nan-makefiles

2011-01-30 15:29:22 +00:00

tests

fix [#26003] Twice applied modifier with Convert to mesh with several multi-user objects

2011-02-10 04:48:49 +00:00

CMakeLists.txt

- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

2011-01-23 11:42:29 +00:00

SConscript

dont build blender/kernel if the game engines disabled.

2010-10-31 00:56:46 +00:00