[Bf-blender-cvs] [5ca1eb96c7f] master: Merge branch 'blender-v2.83-release'

[Brecht Van Lommel]

Commit: 5ca1eb96c7f2d078016ffda3f42067c57a0d06d3
Author: Brecht Van Lommel
Date:   Tue May 12 21:55:33 2020 +0200
Branches: master
https://developer.blender.org/rB5ca1eb96c7f2d078016ffda3f42067c57a0d06d3

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
index c333319ada1,9c94228414d..ee29519c849
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
@@@ -21,6 -21,8 +21,8 @@@
   * \ingroup freestyle
   */
  
 -#include "BLI_map.h"
++#include "BLI_map.hh"
+ 
  #include "../stroke/StrokeRenderer.h"
  #include "../system/FreestyleConfig.h"