Tamito Kajiyama 0896a22723 Merged changes in the trunk up to revision 42902. ...

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c

2011-12-27 22:12:46 +00:00

..

blender

Merged changes in the trunk up to revision 42902.

2011-12-27 22:12:46 +00:00

blenderplayer

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

creator

Merged changes in the trunk up to revision 42902.

2011-12-27 22:12:46 +00:00

darwin

replace former applescript with an editable one

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

gameengine

Cleaning up the GPU_extensions_init/exit() code a bit to keep the Blenderplayer from crashing on exit and restart.

2011-12-23 07:10:01 +00:00

icons

set svn end of lines to native

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

tests

patch [#29534] Change Matrix Representation and Access in Python to Conform with Standard Notation

2011-12-22 01:05:03 +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