svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:55:23 +0000 (03:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jul 2011 03:55:23 +0000 (03:55 +0000)
commitfc95382a977163a1d499c732960e7501cc065833
tree3bbbe419ba513f030f95715c04a8adb39c6e6579
parentac2dd4099167d9ab6306f3fcb83610a5d01ffae1
parentce0ad0b40b93fc6074daaba6ead0e0e82867d4d2
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
39 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/object_bake.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_util.h
source/blender/python/mathutils/mathutils.c
source/blender/python/mathutils/mathutils.h
source/blender/python/mathutils/mathutils_Color.c
source/blender/python/mathutils/mathutils_Color.h
source/blender/python/mathutils/mathutils_Euler.c
source/blender/python/mathutils/mathutils_Euler.h
source/blender/python/mathutils/mathutils_Matrix.c
source/blender/python/mathutils/mathutils_Matrix.h
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/python/mathutils/mathutils_Quaternion.h
source/blender/python/mathutils/mathutils_Vector.c
source/blender/python/mathutils/mathutils_Vector.h
source/blender/python/mathutils/mathutils_geometry.c
source/blender/python/mathutils/mathutils_geometry.h
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt