[Bf-blender-cvs] [df558cb6056] lanpr-under-gp: Merge remote-tracking branch 'origin/master' into lanpr-under-gp

[YimingWu]

Commit: df558cb6056a2d3e157cf45cfe6583012958d300
Author: YimingWu
Date:   Thu Sep 10 09:56:05 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBdf558cb6056a2d3e157cf45cfe6583012958d300

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
#	source/blender/editors/include/ED_geometry.h
#	source/blender/editors/lineart/lineart_ops.c
#	source/blender/editors/mesh/editmesh_intersect.c
#	source/blender/editors/object/object_facemap_ops.c
#	source/blender/gpu/CMakeLists.txt
#	source/blender/gpu/intern/gpu_batch.cc
#	source/blender/gpu/intern/gpu_context_private.hh
#	source/blender/gpu/intern/gpu_immediate.cc
#	source/blender/gpu/intern/gpu_immediate_private.hh
#	source/blender/gpu/intern/gpu_platform_private.hh
#	source/blender/gpu/intern/gpu_primitive_private.h
#	source/blender/gpu/intern/gpu_query.cc
#	source/blender/gpu/opengl/gl_batch.cc
#	source/blender/gpu/opengl/gl_context.cc
#	source/blender/gpu/opengl/gl_drawlist.cc
#	source/blender/gpu/opengl/gl_immediate.cc
#	source/blender/python/intern/bpy_rna_ui.h

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



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

diff --cc source/blender/editors/lineart/lineart_ops.c
index 0c4e3f45420,00000000000..e16691bf5b5
mode 100644,000000..100644
--- a/source/blender/editors/lineart/lineart_ops.c
+++ b/source/blender/editors/lineart/lineart_ops.c
@@@ -1,36 -1,0 +1,39 @@@
 +/*
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
 + * as published by the Free Software Foundation; either version 2
 + * of the License, or (at your option) any later version.
 + *
 + * This program is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + * GNU General Public License for more details.
 + *
 + * You should have received a copy of the GNU General Public License
 + * along with this program; if not, write to the Free Software Foundation,
 + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 + *
 + * The Original Code is Copyright (C) 2019 Blender Foundation.
 + * All rights reserved.
 + */
 +
 +/** \file
 + * \ingroup editors
 + */
 +
++#pragma once
++
 +#include <stdlib.h>
 +
 +#include "BLI_utildefines.h"
 +
 +#include "WM_api.h"
 +
 +#include "ED_lineart.h"
 +
 +void ED_operatortypes_lineart(void)
 +{
 +  WM_operatortype_append(SCENE_OT_lineart_update_strokes);
 +  WM_operatortype_append(SCENE_OT_lineart_bake_strokes);
 +}
++