diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-10 17:43:57 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-10 17:43:57 +0300 |
| commit | 6a37a83fc05b0dce1746a70da2ed58cbbea8d85c (patch) | |
| tree | e1b72d43a004a501bfbd02725f663b5989a0bb8d /source/blender/gpencil_modifiers | |
| parent | a1b0c4ab9d95327bf3a665fe95eec225e9f2cbe1 (diff) | |
| parent | f8df6286c2c05d8480f84d5e5640c4bcb46aa4ad (diff) | |
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenkernel/intern/gpencil.c
source/blender/editors/sculpt_paint/paint_ops.c
Diffstat (limited to 'source/blender/gpencil_modifiers')
6 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c index 27c8175af3f..eceb45780cf 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c @@ -39,7 +39,7 @@ #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_modifier.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_scene.h" #include "BKE_main.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c index e258fbdccd1..11ba639fa83 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c @@ -44,7 +44,7 @@ #include "BKE_main.h" #include "BKE_scene.h" #include "BKE_layer.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_collection.h" #include "DEG_depsgraph.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c index bc62d0d69bb..132d86a87c8 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c @@ -40,7 +40,7 @@ #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_modifier.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_scene.h" #include "BKE_main.h" #include "BKE_layer.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c index 9dbf7b35bc5..9286fcfff56 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c @@ -36,7 +36,7 @@ #include "BKE_gpencil_modifier.h" #include "BKE_modifier.h" #include "BKE_lattice.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_scene.h" #include "BKE_main.h" #include "BKE_layer.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c index ef06e14b3d7..42d45512dc5 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c @@ -38,7 +38,7 @@ #include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" #include "BKE_modifier.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_scene.h" #include "BKE_main.h" #include "BKE_layer.h" diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c index bc545ce6ce8..919dbf91862 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c @@ -46,7 +46,7 @@ #include "BKE_main.h" #include "BKE_scene.h" #include "BKE_layer.h" -#include "BKE_library_query.h" +#include "BKE_lib_query.h" #include "BKE_collection.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" |