Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 00:18:50 +0000 (11:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 7 Feb 2018 00:19:01 +0000 (11:19 +1100)
commit17577c53c672dcc8d5493324c4bcb970db455f2a
tree575d227e936e1653ef200c464a28a9e4453c14dd
parent77b61b554ca10353b408645e3316e06c8d240388
parent1e4b612d6a63ce781f229ddd6e3073a5d6951950
Merge branch 'master' into blender2.8
47 files changed:
source/blender/CMakeLists.txt
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_260.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/depsgraph_build.cc
source/blender/draw/engines/eevee/eevee_depth_of_field.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/modes/object_mode.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_buttons/buttons_texture.c
source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_fluidsim.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/modifiers/intern/MOD_softbody.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp