From 4452bea2f170ec7fe48c223c8c499f1eb9b5356c Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Thu, 16 Mar 2017 23:32:35 -0400 Subject: 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? --- source/blender/gpu/GPU_batch.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/gpu/GPU_batch.h') diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 6d63965952a..2232e333bb6 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -30,7 +30,11 @@ #pragma once -#include "gawain/batch.h" +#include "../../../intern/gawain/gawain/batch.h" + +// TODO: CMake magic to do this: +// #include "gawain/batch.h" + #include "GPU_shader.h" /* Extend Batch_set_program to use Blender’s library of built-in shader programs. */ -- cgit v1.2.3