diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 09:32:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 09:32:30 +0300 |
commit | 33a5248b6c82d7930089544be10480fa0a25aa80 (patch) | |
tree | 8ee84267fae97ac57bdd9d6b3c396e793d77d6fe /source/blender/editors/render | |
parent | de9e45a88bd8ceee4af1ea907bb93a3bf22024b9 (diff) | |
parent | 6d73e2d3cf3c9a8fa4c73e04d02caecfd716e962 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 8ac223b1389..a8f3d1739bd 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -38,7 +38,6 @@ #include "BLI_math_color_blend.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_jitter.h" #include "BLI_threads.h" #include "BLI_task.h" |