diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:05:04 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:05:04 +0300 |
| commit | ed32db06c1244d8428fd22ce418f19ac0a81e893 (patch) | |
| tree | c99252b8068da22c30d4a0166b9c293b43d7dab6 /source/blender/draw/engines/overlay/overlay_private.h | |
| parent | 451400f6e6b2911be7059e6d6bf53cc312a2a3c3 (diff) | |
| parent | 8d16dc029e6c52b16666b4edfafa66794d64b1a4 (diff) | |
Merge branch 'master' into fluid-mantaflowfluid-mantaflow
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_private.h')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h index 9be92e0ab14..996ee845799 100644 --- a/source/blender/draw/engines/overlay/overlay_private.h +++ b/source/blender/draw/engines/overlay/overlay_private.h @@ -571,4 +571,4 @@ OVERLAY_InstanceFormats *OVERLAY_shader_instance_formats_get(void); void OVERLAY_shader_free(void); -#endif /* __OVERLAY_PRIVATE_H__ */
\ No newline at end of file +#endif /* __OVERLAY_PRIVATE_H__ */ |