At last... this merge should finally do the trick!
[blender.git] / source / blender / makesdna / DNA_space_types.h
index 28b5f882288e4b0e3bf0670148fb190ca62f18bf..f66c0c31fda1eab9f4855b3faf3835377d4927ec 100644 (file)
@@ -229,7 +229,7 @@ typedef struct SpaceImage {
        char dt_uv; /* UV draw type */
        char sticky; /* sticky selection type */
        char dt_uvstretch;
-       char pad;
+       char around;
        
        float xof, yof;                                 /* user defined offset, image is centered */
        float zoom, pad4;                               /* user defined zoom level */