[Bf-blender-cvs] [d9aa1721416] temp-gpencil-io: Merge branch 'master' into temp-gpencil-io

[Antonio Vazquez]

Commit: d9aa17214166bcb06510f801fb9680e7cffb8ad8
Author: Antonio Vazquez
Date:   Mon Mar 22 12:28:31 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBd9aa17214166bcb06510f801fb9680e7cffb8ad8

Merge branch 'master' into temp-gpencil-io

 Conflicts:
	source/blender/python/intern/bpy_app_build_options.c

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



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

diff --cc source/blender/python/intern/bpy_app_build_options.c
index d2e35a2a3bf,9f12c9f80f1..676d1b8045f
--- a/source/blender/python/intern/bpy_app_build_options.c
+++ b/source/blender/python/intern/bpy_app_build_options.c
@@@ -65,8 -65,7 +65,9 @@@ static PyStructSequence_Field app_built
      {"fluid", NULL},
      {"xr_openxr", NULL},
      {"potrace", NULL},
 +    {"pugixml", NULL},
 +    {"haru", NULL},
+     /* Sentinel (this line prevents `clang-format` wrapping into columns). */
      {NULL},
  };