Merging r59182 through r59257 from trunk into soc-2013-depsgraph_mt
[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h
index 002d77fb0e62c01ce95562499899ec43585c1d3f..5d6ccc92475f7bbd1ba16e758d920e188ce35d54 100644 (file)
@@ -431,7 +431,8 @@ typedef struct RenderData {
         * Render to image editor, fullscreen or to new window.
         */
        short displaymode;
-       short pad7;
+       char use_lock_interface;
+       char pad7;
 
        /**
         * Flags for render settings. Use bit-masking to access the settings.