diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/render/intern/include | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render/intern/include')
-rw-r--r-- | source/blender/render/intern/include/render_result.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/renderpipeline.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/include/zbuf.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index 9a1b1b5abe8..eebecc53101 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h index 68fbc01b914..7a409d2dc1c 100644 --- a/source/blender/render/intern/include/renderpipeline.h +++ b/source/blender/render/intern/include/renderpipeline.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index 1a93fc6c3b2..3dfcbc355c4 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of |