1bcf9217eb
Conflicts: source/blender/blenkernel/BKE_pointcache.h source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/pointcache.c source/blender/editors/include/ED_particle.h source/blender/editors/physics/particle_edit.c source/blender/editors/physics/particle_edit_undo.c source/blender/editors/physics/particle_object.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_pointcache.c source/blender/editors/space_time/space_time.c source/blender/editors/space_view3d/drawobject.c source/blender/editors/space_view3d/view3d_edit.c source/blender/editors/transform/transform_conversions.c source/blender/editors/transform/transform_generics.c source/blender/editors/transform/transform_manipulator.c source/blender/makesrna/intern/rna_object.c source/blender/makesrna/intern/rna_object_force.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blenderplayer/bad_level_call_stubs/stubs.c