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)
1  2 
release/scripts/startup/bl_operators/uvcalc_lightmap.py
source/blender/blenkernel/intern/text.c