svn merge ^/trunk/blender -r41100:41150
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 04:18:28 +0000 (04:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 04:18:28 +0000 (04:18 +0000)
commit0503a4f7a6fa2aba573ff4f8d4c6d7f387894952
tree26fa3836cd19536e6445ef4aad8fcecece1614f3
parent618d4d1a6e4a3df8399549fa80846cdeacb7299c
parent2bd9519e39f7c383005fd531f4c7dd92cce246ad
svn merge ^/trunk/blender -r41100:41150
35 files changed:
CMakeLists.txt
intern/ghost/intern/GHOST_SystemSDL.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_eulers.c
source/blender/blenkernel/intern/BME_mesh.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/BLI_ghash.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/curve/editfont.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt_undo.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_solidify.c
source/creator/CMakeLists.txt
source/creator/creator.c