diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-02-10 12:08:07 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-02-10 12:08:07 +0300 |
| commit | 9918b6c453b38d8d0667675ab4a425a4087f4632 (patch) | |
| tree | a62345f764997d9abdd2035e5b4b8a23d6cf61a3 /source/blender/gpu | |
| parent | b1059489b4e8ea3f878145b5374ab564532b9c82 (diff) | |
| parent | a1b0c4ab9d95327bf3a665fe95eec225e9f2cbe1 (diff) | |
Merge branch 'greasepencil-object' into greasepencil-refactor
Conflicts:
source/blender/blenloader/intern/versioning_280.c
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_texture.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 456d5941bfb..b0bbf8301a5 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -31,12 +31,12 @@ extern "C" { #endif struct GPUVertBuf; +struct ImBuf; struct Image; struct ImageUser; struct MovieClip; struct MovieClipUser; struct PreviewImage; -struct ImBuf; struct GPUFrameBuffer; typedef struct GPUTexture GPUTexture; |