Campbell Barton 2dc6b8f835 svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-25 14:34:36 +00:00

..

generic

svn merge -r37600:37700 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-25 12:59:54 +00:00

intern

svn merge -r37700:37800 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-07-25 14:34:36 +00:00

BPY_extern.h

own patch [#27752] Python Callback (Scriptlink functionality)

2011-06-24 16:54:30 +00:00

CMakeLists.txt

use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.

2010-12-08 08:43:06 +00:00

rna_dump.py

mathutils.Matrix.OrthoProjection(plane, size, axis), merged axis and plane args. since axis was only allowed when plane was 'R'.

2011-02-04 09:35:20 +00:00

SConscript

remove bpy python api from blenderplayer, it was being linked but not initialized/available.

2011-03-31 15:28:53 +00:00

simple_enum_gen.py

copied across changes which were missed by merging.

2011-05-09 02:45:52 +00:00