Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 2 Nov 2016 09:48:06 +0000 (10:48 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 2 Nov 2016 09:59:52 +0000 (10:59 +0100)
commita41bbd3053c8f07c24ccb07eaeff09cc078cc4d4
treeaed76b27fa7b6fde5023b6d3ecd5f5079ed24aad
parentfb6f42dc4f0dc24a992a631b7aac3290449e815a
parent13ee9b8ebe08ee95478f51537f10e9a1b1e4d863
Merge remote-tracking branch 'origin/master' into blender2.8
30 files changed:
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.cpp
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_points.cc
source/blender/alembic/intern/abc_points.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object_deform.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/drawvolume.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/gpu/GPU_shader.h
source/blender/gpu/intern/gpu_shader.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_smoke.c