svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:49:37 +0000 (01:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:49:37 +0000 (01:49 +0000)
commit9f8608a8ec80bcf1a5a14b54a27f47dd57a09802
tree4b11182bc00a5b918dac8463b8711ef72d2fb9fc
parent4e118bb22f246468a6e0a5524c87c0243b7a3d5d
parent9e17ecf0100af4e95f32a7b03673e880a9fc8d1e
svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/mathutils/mathutils.c
source/blender/python/mathutils/mathutils_Color.c
source/blender/python/mathutils/mathutils_Euler.c
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/python/mathutils/mathutils_Vector.c
source/blender/python/mathutils/mathutils_geometry.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp