diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:10:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:11:45 +0300 |
| commit | 0911acb5cf49c5ba05b1df045b41697704aa288a (patch) | |
| tree | 9e6a84f0592cbd3b1066339538ae95289cf2eb08 /source/blender/gpu/intern/gpu_select_sample_query.c | |
| parent | 5b643018348280ee601a20fb9329d5a313c23446 (diff) | |
| parent | 6654e109df952be3a3128fae2508a02c196ae593 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu/intern/gpu_select_sample_query.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_select_sample_query.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c index 919ccbea2e9..4520025ea7f 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.c +++ b/source/blender/gpu/intern/gpu_select_sample_query.c @@ -37,7 +37,7 @@ #include "GPU_select.h" #include "GPU_extensions.h" #include "GPU_glew.h" - + #include "MEM_guardedalloc.h" #include "BLI_rect.h" |