Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:54:05 +0000 (21:54 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 19 Aug 2017 11:54:05 +0000 (21:54 +1000)
commit2332051419d9aeb99477335e64720b82b106426a
tree61935b3296c88f2c6f6227f158fdab5d86d41072
parent4437ccf4767c6958847da19c8f8b839f6e3e263b
parent1cc4033df8d7fdd87bc1be14e265ab77f0713e54
Merge branch 'master' into blender2.8
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/gpu_offscreen.c
tests/python/CMakeLists.txt