Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 26 Sep 2016 15:19:03 +0000 (17:19 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 26 Sep 2016 15:19:03 +0000 (17:19 +0200)
commit8cff9c20fff954cb0aa725c15c064c3aecf322b5
tree99bd6e859bcfbe56f555bfe2d1e4eae374fdf1c3
parent628ef78e8a9db7ba37cfc1bbb6b2d4ac0dbecab3
parentb23ffded0866b5b24cb50fca669efde4ec1e3ffd
Merge branch 'master' into blender2.8

WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff.
Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway).

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_view3d/drawvolume.c
source/blender/makesrna/intern/rna_smoke.c
17 files changed:
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_sca.h
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/screen/screen_context.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_smoke.c