svn merge ^/trunk/blender -r43733:43751
authorCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jan 2012 21:49:49 +0000 (21:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 29 Jan 2012 21:49:49 +0000 (21:49 +0000)
commit870aa901120fc8db499f9bea3a9a86006ef4cc3a
treeb39a0a390179ba117310532545ff146dd3bb8dc5
parentde4eeb96946943289ac898525f09fc9c7afd4157
parentb820ec4ae4a62a05fc9ac6ca9c93a17128675407
svn merge ^/trunk/blender -r43733:43751
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_cloth.c