Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 07:36:49 +0000 (17:36 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Jul 2017 07:36:49 +0000 (17:36 +1000)
1  2 
intern/ghost/intern/GHOST_WindowWin32.cpp
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_ui/properties_data_armature.py
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_shading.c
source/blender/editors/sculpt_paint/paint_image_proj.c