Blender Git Loki

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/intern/gpencil.c
source/blender/editors/gpencil/gpencil_trace_ops.c
source/blender/editors/gpencil/gpencil_trace_utils.c

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

GPencil: Cleanup unused code

GPencil: More code cleanup of unused code

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

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

GPencil: Rename Mask material to Holdout in Trace

Mask was the old naming, now must be Holdout.

Merge branch 'master' into greasepencil-object

GPencil: Hide trace image menu option if POTRACE is OFF

This hide the menu if the library is not included as option in Make.

Thanks @LazyDodo for his help.

GPencil: Fix typo error in CMake in previous commit

GP: Update GP to use potrace from SVN/System

and remove it from /extern

Merge branch 'master' into greasepencil-object

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl

GPencil: Define default destructor

GPencil: Fix compiler warnings