svn merge ^/trunk/blender -r42053:42069
authorCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 15:33:44 +0000 (15:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 22 Nov 2011 15:33:44 +0000 (15:33 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/sculpt_paint/paint_image.c
source/blender/modifiers/intern/MOD_ocean.c