Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jul 2016 02:00:58 +0000 (12:00 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jul 2016 02:00:58 +0000 (12:00 +1000)
commit251349c3c2269fff915d1bb85911211563493071
tree35524bdb77d583562227ee11b1ff516ea278e00e
parentb1532493c27b08444745cef348641f3a0e899ba8
parenta27acefd0c89aab63a6c243a844e2790dfad961a
Merge branch 'master' into blender2.8
13 files changed:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/texture.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/gpu/intern/gpu_codegen.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_nodetree.c