svn merge ^/trunk/blender -r46380:46390
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:12:47 +0000 (00:12 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:12:47 +0000 (00:12 +0000)
commit67dc5597b8f3d93995df450fc91381fa6b28d239
tree85116ad8e2b04254e90144f5af6dfe497ccbc1e8
parente8c945bfb9ec03f486a1df4dd9b0ea5c833c3ee8
parentd5b53420f61b1fd9020465c5c6603d82b93cc97d
svn merge ^/trunk/blender -r46380:46390
intern/cycles/kernel/kernel_camera.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/camera.cpp
source/blender/editors/curve/editcurve.c
source/blender/editors/render/render_opengl.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/modifiers/intern/MOD_solidify.c