Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jun 2018 09:06:43 +0000 (11:06 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 11 Jun 2018 09:06:43 +0000 (11:06 +0200)
commit4ac87d58eb8d0dd6cb9d4a857c8b5aca4c7abb64
treef35d268add2f5c770b1f7b3dbb38098cf442c9b1
parentb6be8c03942bc254921117e77e406ca225a47aa7
parent28c34ae7e2d61d0b1c570b7d9a303267404e54be
Merge branch 'master' into blender2.8
release/scripts/startup/bl_operators/uvcalc_lightmap.py
source/blender/blenkernel/intern/text.c