svn merge ^/trunk/blender -r43639:43664
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 16:18:20 +0000 (16:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jan 2012 16:18:20 +0000 (16:18 +0000)
commit4af4863baf64e14959454a10443e0ae06b518e7e
tree06696b03fd54211a971e60f01fd176fcfe963fb9
parent644e44e7b6f5d10915f44282fcd728153d71e4fe
parent1f9e25ac1a7851ab2503b88564c0d480b9e125cf
svn merge ^/trunk/blender -r43639:43664
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_boolean_util.c