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)
commit9bdd12d884c5130397e67f72caad2770d9524c9a
treef26951742aadf0c14810ed581bad9393cc2d23ec
parentd99532e1d8fd49019003046dcf471c85a52e0398
parentd1dc5e0a53c5a3484b7d20eb3a9847b53a227791
Merge branch 'master' into blender2.8
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