diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-17 06:32:35 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-17 06:32:35 +0300 |
| commit | 4452bea2f170ec7fe48c223c8c499f1eb9b5356c (patch) | |
| tree | 28dcc9ac042fcce5c77f3c60b4ce8af8677fa4a8 /source/blender/gpu/GPU_immediate.h | |
| parent | b4e8dc8c82dfcae60f33e39684272867745a8af2 (diff) | |
move Gawain library to intern
Before now it lived in source/blender/gpu for convenience. Only a few files in the gpu module use Gawain directly.
Tested on Mac, time to push and test on Windows.
Todo: some CMake magic to make it easy to
#include "gawain/some_header.h"
from any C or H file. Main problem here is the many editors that include GPU_immediate.h which includes Gawain's immediate.h -- is there a way to avoid changing every editor's CMakeLists?
Diffstat (limited to 'source/blender/gpu/GPU_immediate.h')
| -rw-r--r-- | source/blender/gpu/GPU_immediate.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 4a0840e22c0..35964a81030 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -30,8 +30,13 @@ #pragma once -#include "gawain/immediate.h" -#include "gawain/imm_util.h" +#include "../../../intern/gawain/gawain/immediate.h" +#include "../../../intern/gawain/gawain/imm_util.h" + +// TODO: CMake magic to do this: +// #include "gawain/immediate.h" +// #include "gawain/imm_util.h" + #include "GPU_shader.h" /* Extend immBindProgram to use Blender’s library of built-in shader programs. |