svn merge ^/trunk/blender -r44024:44076
authorCampbell Barton <ideasman42@gmail.com>
Mon, 13 Feb 2012 04:14:35 +0000 (04:14 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 13 Feb 2012 04:14:35 +0000 (04:14 +0000)
commit2d1a05874b46d31ee3598ec786a77b45512d99e1
treef0c453f231b52b5898911f77365d908145da8460
parent7be1cd733dfe064d1976b706610c39f97e536b90
parent399ad54204ad9c3bc9dbd15ec4840824d224dc0c
svn merge ^/trunk/blender -r44024:44076
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_explode.c