Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Tue, 18 Apr 2017 14:30:13 +0000 (16:30 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 18 Apr 2017 14:30:13 +0000 (16:30 +0200)
commitc9d78b6c434b5b1672ad0e0a2854eb9c1199f379
tree47647ceb5a78cb951768bb03fbca0322e52fe2b2
parentbc6a75b405c4e0b1e85c9c6ec6646fd2d3f67686
parent70018eb16e721f9171834afd4bf70dc017af1369
Merge remote-tracking branch 'origin/master' into blender2.8
30 files changed:
build_files/build_environment/install_deps.sh
release/scripts/startup/bl_ui/space_view3d.py
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_util.cc
source/blender/alembic/intern/abc_util.h
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/armature_update.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenlib/CMakeLists.txt
source/blender/depsgraph/intern/builder/deg_builder_nodes.h
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/space_node/drawnode.c
source/blender/gpu/GPU_material.h
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_compositing.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader.c
source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c