svn merge ^/trunk/blender -r42973:42991
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Dec 2011 09:23:06 +0000 (09:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Dec 2011 09:23:06 +0000 (09:23 +0000)
commit50ca81154e5ead104723ba137942e92cb860ace8
tree31c1c97893da5d6eec3d1cdc6af0f400e911391d
parent7ee3da151d781bd3bac69958bb7d5d6b5cde125e
parent6d965f4493871c9bd4550939b8263d0c509b7c41
svn merge ^/trunk/blender -r42973:42991
12 files changed:
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/object/object_bake.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesdna/DNA_defs.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_vec_types.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp