diff options
| author | Tianwei Shen <shentianweipku@gmail.com> | 2017-04-15 16:44:48 +0300 |
|---|---|---|
| committer | Tianwei Shen <shentianweipku@gmail.com> | 2017-04-15 16:44:48 +0300 |
| commit | f11ff0e672b8df79cdab85c8bebbd8c36c2c1cff (patch) | |
| tree | c80138a7af123907c3eb26fee978644c702795cf /intern/cycles/util/util_view.cpp | |
| parent | 473653f33798b727148e8f6379f31cbba95de479 (diff) | |
| parent | 97c9c6a3f321f35f0b58ab167aea97a790c94cfb (diff) | |
Merge branch 'master' into soc-2016-multiviewsoc-2016-multiview
Diffstat (limited to 'intern/cycles/util/util_view.cpp')
| -rw-r--r-- | intern/cycles/util/util_view.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp index 9796a5f896d..10d86167921 100644 --- a/intern/cycles/util/util_view.cpp +++ b/intern/cycles/util/util_view.cpp @@ -17,11 +17,11 @@ #include <stdio.h> #include <stdlib.h> -#include "util_opengl.h" -#include "util_string.h" -#include "util_time.h" -#include "util_version.h" -#include "util_view.h" +#include "util/util_opengl.h" +#include "util/util_string.h" +#include "util/util_time.h" +#include "util/util_version.h" +#include "util/util_view.h" #ifdef __APPLE__ #include <GLUT/glut.h> |