diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 19:03:44 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 20:00:49 +0300 |
| commit | 418b24551e1b8a4458deceedca945a631f0684ac (patch) | |
| tree | cfb1f42ff1eb58e36f714132d3ed623c18bfc6f7 /source/blender/makesdna/DNA_camera_types.h | |
| parent | a84794b39960029a61d7c2c79e4ad7e2fda06bb7 (diff) | |
| parent | 9269574089a742130f02c0a1184a19d94f0e665d (diff) | |
Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into pbr-online
Merge conflicts fixes include fix on ob->reflectionplane for write and
read, and a few manual fixes to account for the ID remap changes
Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/world.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_draw.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_texture.c
source/blender/gpu/shaders/gpu_shader_vertex_world.glsl
Diffstat (limited to 'source/blender/makesdna/DNA_camera_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 68741578f27..52e40cbc098 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -85,8 +85,8 @@ typedef struct Camera { char sensor_fit; char pad[7]; - /* Stereo settings */ - struct CameraStereoSettings stereo; + /* Stereo settings */ + struct CameraStereoSettings stereo; } Camera; /* **************** CAMERA ********************* */ |