Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2018 07:25:40 +0000 (09:25 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 29 Jun 2018 07:25:40 +0000 (09:25 +0200)
commit18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90
treeb35fd8ad683c79a5cbd9f8419220ee1892cd9ef8
parent332548753008f941d920c8a9ee1079dbf1895d37
parentb3727668168075137f2ded11d7a7821548e4451d
Merge branch 'master' into blender2.8
49 files changed:
source/CMakeLists.txt
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/BKE_constraint.h
source/blender/blenkernel/BKE_context.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/BKE_fluidsim.h
source/blender/blenkernel/BKE_freestyle.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_mesh_tangent.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_softbody.h
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/BKE_world.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/idprop.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/workspace.c
source/blender/blenloader/intern/readfile.h
source/blender/draw/engines/workbench/workbench_materials.c
source/blender/makesdna/DNA_curve_types.h
source/blender/makesdna/DNA_effect_types.h
source/blender/makesdna/DNA_fileglobal_types.h
source/blender/makesdna/DNA_lamp_types.h
source/blender/makesdna/DNA_lattice_types.h
source/blender/makesdna/DNA_layer_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_object_force_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_outliner_types.h
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesdna/DNA_screen_types.h
source/blender/makesdna/DNA_texture_types.h
source/blender/makesdna/DNA_view2d_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/modifiers/intern/MOD_fluidsim_util.h
source/blender/modifiers/intern/MOD_subsurf.c