diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:52:48 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:54:53 +0300 |
| commit | 2db84a8ee7cd3873e11eb0c13abc09869caa0042 (patch) | |
| tree | ea15209cc9742e23f36a7e692eb837723bfa64b3 /source/blender/editors/gpencil/CMakeLists.txt | |
| parent | a41ee7ea1ae9bb1bcc537576d9ffdb3bca3201f3 (diff) | |
Fix all merge conflicts
There was a lot of conflicts and to solve, I refresh manually the source folders.
Diffstat (limited to 'source/blender/editors/gpencil/CMakeLists.txt')
| -rw-r--r-- | source/blender/editors/gpencil/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 09a3cac0d48..866df16f3d6 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -12,8 +12,8 @@ set(INC ../../makesdna ../../makesrna ../../windowmanager - ../../../../intern/glew-mx ../../../../intern/guardedalloc + ../../bmesh # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna ) |