Campbell Barton 8949387186 svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-31 05:28:00 +00:00

..

generic

svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-31 05:28:00 +00:00

intern

cmake maintenance

2011-05-31 01:15:44 +00:00

BPY_extern.h

change unit evaluation only to do try the units replacements if evaluating with python fails, in rare cases its possible a valid python expression could get units applied to it.

2011-04-17 12:47:20 +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