Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 13 Oct 2016 16:42:54 +0000 (16:42 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 13 Oct 2016 16:42:54 +0000 (16:42 +0000)
commitdfa5b32c8cc4f9df7da660754eae773f5df102e6
tree73e32bbc235b36a991f722d589c00462fb7eee8b
parentecbedce81eb45e013ff03af64be9bc71c896e85b
parent625b504b23beb11e8a02408e7474e38fa525e8ee
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
source/blender/windowmanager/intern/wm_operators.c