[Bf-blender-cvs] [33f9fe3c620] master: Merge branch 'blender-v2.83-release'

[Antonio Vazquez]

Commit: 33f9fe3c620fef1d1ad2cb3443bf503afdb9db3b
Author: Antonio Vazquez
Date:   Tue May 12 17:54:20 2020 +0200
Branches: master
https://developer.blender.org/rB33f9fe3c620fef1d1ad2cb3443bf503afdb9db3b

Merge branch 'blender-v2.83-release'

 Conflicts:
	release/scripts/startup/bl_ui/properties_render.py
	source/blender/blenkernel/BKE_blender_version.h

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



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

diff --cc release/scripts/startup/bl_ui/properties_render.py
index 2d13aed617c,30094da20c8..b1ae6290ae7
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@@ -684,6 -717,8 +705,8 @@@ classes = 
      RENDER_PT_eevee_indirect_lighting,
      RENDER_PT_eevee_indirect_lighting_display,
      RENDER_PT_eevee_film,
 -    RENDER_PT_eevee_film_overscan,
++
+     RENDER_PT_gpencil,
      RENDER_PT_opengl_sampling,
      RENDER_PT_opengl_lighting,
      RENDER_PT_opengl_color,