Merged trunk up to rev41928
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 16 Nov 2011 20:48:21 +0000 (20:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 16 Nov 2011 20:48:21 +0000 (20:48 +0000)
commit6e9fd309b84b201784270b9f090e6ff365b0a964
tree383f3e4d7ee354df68e8847b33e6e26773b846c3
parent25a0ff4110b4e4419dc360a3fb2aca2fa16c1751
parent9f51785c4d0038d24fed473dc1d803458f838884
Merged trunk up to rev41928
15 files changed:
intern/cycles/blender/CMakeLists.txt
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_util.h
release/scripts/presets/camera/Sony_A55.py
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/space_clip.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_dynamicpaint_types.h
source/blender/makesrna/intern/rna_dynamicpaint.c