Commit: 7d36408b8279a10940f7f1f5a9f2e59c89d5c680
Author: Bastien Montagne
Date: Tue Jun 12 16:29:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7d36408b8279a10940f7f1f5a9f2e59c89d5c680
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_draw.c
source/blender/python/intern/gpu_offscreen.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
