diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
| commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
| tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /source/blender/render | |
| parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
| parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/shadbuf.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/zbuf.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 731a5ec4e22..9182d545089 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -38,7 +38,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_jitter.h" +#include "BLI_jitter_2d.h" #include "BLI_utildefines.h" #include "DNA_camera_types.h" diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c index 7c62bf4cd94..fb441662829 100644 --- a/source/blender/render/intern/source/shadbuf.c +++ b/source/blender/render/intern/source/shadbuf.c @@ -40,7 +40,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_jitter.h" +#include "BLI_jitter_2d.h" #include "BLI_memarena.h" #include "BLI_rand.h" #include "BLI_utildefines.h" diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index f39936dc01f..770a270592c 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -42,7 +42,7 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_jitter.h" +#include "BLI_jitter_2d.h" #include "BLI_threads.h" #include "BLI_utildefines.h" |