[Bf-blender-cvs] [cadeb283350] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: cadeb2833508b93d00345aa47ae9706ea1e7f405
Author: Antonio Vazquez
Date:   Fri Sep 18 18:31:34 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBcadeb2833508b93d00345aa47ae9706ea1e7f405

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/properties_material_gpencil.py
	source/blender/draw/engines/gpencil/gpencil_cache_utils.c
	source/blender/draw/engines/gpencil/gpencil_draw_data.c
	source/blender/draw/engines/gpencil/gpencil_engine.h
	source/blender/draw/engines/gpencil/gpencil_shader_fx.c
	source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
	source/blender/makesrna/intern/rna_material.c

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



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