From 2ef695fabf33e227d742aa5adf39490a2a87f58b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 2 Jun 2018 13:12:42 -0600 Subject: build_environment: fix paths in osl.diff --- build_files/build_environment/patches/osl.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/build_environment/patches/osl.diff b/build_files/build_environment/patches/osl.diff index 960a2506374..ccf34d99699 100644 --- a/build_files/build_environment/patches/osl.diff +++ b/build_files/build_environment/patches/osl.diff @@ -10,8 +10,8 @@ diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_o MAIN_DEPENDENCY ${flexsrc} DEPENDS ${${compiler_headers}} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) ---- a/src/include/OSL/oslconfig.h 2016-10-31 16:48:19 -0600 -+++ b/src/include/OSL/oslconfig.h 2018-05-27 11:18:08 -0600 +--- osl/src/external_osl/src/include/OSL/oslconfig.h 2016-10-31 16:48:19 -0600 ++++ osl/src/external_osl/src/include/OSL/oslconfig.h 2018-05-27 11:18:08 -0600 @@ -44,12 +44,18 @@ // same if another packages is compiling against OSL and using these headers // (OSL may be C++11 but the client package may be older, or vice versa -- -- cgit v1.2.3 From 815b1f24fa298784d9204b9248bc69ceb2b3d762 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 2 Jun 2018 13:59:56 -0600 Subject: build_environment: support for msvc2017 and newer cmake. -expanded build_deps.cmd with 2017 support, it can't locate msvc2017 so needs to be run from developer prompt. -Newer cmake was unhappy with openal's cmakelists.txt -collada has warning as error on and errored out on new msvc2017 warnings. --- build_files/build_environment/cmake/openal.cmake | 1 + build_files/build_environment/cmake/options.cmake | 25 ++++++++++++---------- build_files/build_environment/patches/openal.diff | 13 +++++++++++ .../build_environment/windows/build_deps.cmd | 18 +++++++++++++++- 4 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 build_files/build_environment/patches/openal.diff diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake index 3331361bfbc..2af530069a5 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -39,5 +39,6 @@ if(BUILD_MODE STREQUAL Release) PREFIX ${BUILD_DIR}/openal CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openal + PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff ) endif() diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 2dcf653db43..2a89bd726c1 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -56,24 +56,27 @@ if(WIN32) # For OIIO and OSL set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS) - # TODO FIXME highly MSVC specific + if(MSVC_VERSION GREATER 1909) + set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings. + endif() + if(WITH_OPTIMIZED_DEBUG) - set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") else() - set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") endif() - set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") - set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") - set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") if(WITH_OPTIMIZED_DEBUG) - set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") else() - set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") endif() - set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") - set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") - set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") + set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS") set(PLATFORM_FLAGS) set(PLATFORM_CXX_FLAGS) diff --git a/build_files/build_environment/patches/openal.diff b/build_files/build_environment/patches/openal.diff new file mode 100644 index 00000000000..2c9862b95a0 --- /dev/null +++ b/build_files/build_environment/patches/openal.diff @@ -0,0 +1,13 @@ +diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt +--- external_openal_original/CMakeLists.txt 2016-01-24 20:12:39 -0700 ++++ external_openal/CMakeLists.txt 2018-06-02 12:16:52 -0600 +@@ -885,7 +885,8 @@ + OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF) + IF(HAVE_WINDOWS_H) + # Check MMSystem backend +- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502) ++ set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502") ++ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) + IF(HAVE_MMSYSTEM_H) + CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) + IF(HAVE_LIBWINMM) diff --git a/build_files/build_environment/windows/build_deps.cmd b/build_files/build_environment/windows/build_deps.cmd index 96280014df2..500e689cdc8 100644 --- a/build_files/build_environment/windows/build_deps.cmd +++ b/build_files/build_environment/windows/build_deps.cmd @@ -14,10 +14,18 @@ if NOT "%1" == "" ( set BuildDir=VS14 goto par2 ) + if "%1" == "2017" ( + echo "Building for VS2017" + set VSVER=15.0 + set VSVER_SHORT=15 + set BuildDir=VS15 + goto par2 + ) + ) :usage -Echo Usage build_deps 2013/2015 x64/x86 +Echo Usage build_deps 2013/2015/2017 x64/x86 goto exit :par2 if NOT "%2" == "" ( @@ -31,6 +39,10 @@ if NOT "%2" == "" ( if "%1" == "2015" ( set CMAKE_BUILDER=Visual Studio 14 2015 ) + if "%1" == "2017" ( + set CMAKE_BUILDER=Visual Studio 15 2017 + ) + goto start ) if "%2" == "x64" ( @@ -43,6 +55,10 @@ if NOT "%2" == "" ( if "%1" == "2015" ( set CMAKE_BUILDER=Visual Studio 14 2015 Win64 ) + if "%1" == "2017" ( + set CMAKE_BUILDER=Visual Studio 15 2017 Win64 + ) + goto start ) ) -- cgit v1.2.3 From 6221180963c39f9f3f95982070ff6f381ab7e0b2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 3 Jun 2018 10:59:48 +0200 Subject: Cleanup: remove blockscale & handler Replace with link_flag, currently unused, needed for dynamic space types which is planned. --- .../blender/blenloader/intern/versioning_legacy.c | 5 - source/blender/editors/space_view3d/space_view3d.c | 1 - source/blender/makesdna/DNA_action_types.h | 8 +- source/blender/makesdna/DNA_space_types.h | 123 +++++++++++++-------- source/blender/makesdna/DNA_view3d_types.h | 7 +- 5 files changed, 83 insertions(+), 61 deletions(-) diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c index 80490081337..e2bfcad3f7f 100644 --- a/source/blender/blenloader/intern/versioning_legacy.c +++ b/source/blender/blenloader/intern/versioning_legacy.c @@ -1587,8 +1587,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) SpaceLink *sl; for (sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->blockscale == 0.0f) - sl->blockscale = 0.7f; /* added: 5x better zoom in for action */ if (sl->spacetype == SPACE_ACTION) { SpaceAction *sac = (SpaceAction *)sl; @@ -1752,9 +1750,6 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main) for (sa = sc->areabase.first; sa; sa = sa->next) { SpaceLink *sl; for (sl = sa->spacedata.first; sl; sl = sl->next) { - if (sl->blockscale == 0.0f) - sl->blockscale = 0.7f; - /* added: 5x better zoom in for nla */ if (sl->spacetype == SPACE_NLA) { SpaceNla *snla = (SpaceNla *) sl; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 24a3f0f279e..d999b9fef0a 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -315,7 +315,6 @@ static SpaceLink *view3d_new(const bContext *C) v3d = MEM_callocN(sizeof(View3D), "initview3d"); v3d->spacetype = SPACE_VIEW3D; - v3d->blockscale = 0.7f; v3d->lay = v3d->layact = 1; if (scene) { v3d->lay = v3d->layact = scene->lay; diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index 6913f3382e1..0e13aff4d44 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -652,10 +652,10 @@ typedef enum eDopeSheet_Flag { typedef struct SpaceAction { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale; - - short blockhandler[8]; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* copied to region */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 96f512cab0f..00575532d38 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -79,9 +79,9 @@ struct BLI_mempool; typedef struct SpaceLink { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; /* XXX make deprecated */ - short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ + char spacetype; + char link_flag; + char _pad0[6]; } SpaceLink; /* -------------------------------------------------------------------- */ @@ -92,9 +92,10 @@ typedef struct SpaceLink { typedef struct SpaceInfo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ char rpt_mask; char pad[7]; @@ -119,10 +120,10 @@ typedef enum eSpaceInfo_RptMask { typedef struct SpaceButs { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -244,9 +245,10 @@ typedef enum eSpaceButtons_Align { typedef struct SpaceOops { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -327,9 +329,10 @@ typedef enum eSpaceOutliner_Search_Flags { typedef struct SpaceIpo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -403,9 +406,10 @@ typedef enum eGraphEdit_Mode { typedef struct SpaceNla { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ short autosnap; /* this uses the same settings as autosnap for Action Editor */ short flag; @@ -449,8 +453,11 @@ typedef struct SpaceTimeCache { typedef struct SpaceTime { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -508,10 +515,10 @@ typedef enum eTimeline_Cache_Flag { typedef struct SpaceSeq { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -653,8 +660,12 @@ typedef struct FileSelectParams { typedef struct SpaceFile { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + char _pad1[4]; int scroll_offset; struct FileSelectParams *params; /* config and input for file select */ @@ -905,9 +916,10 @@ enum { typedef struct SpaceImage { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - - int flag; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ struct Image *image; struct ImageUser iuser; @@ -934,7 +946,8 @@ typedef struct SpaceImage { /* Filter settings when editor shows other object's UVs. */ int other_uv_filter; - int pad2; + + int flag; MaskSpaceInfo mask_info; } SpaceImage; @@ -1030,9 +1043,10 @@ typedef enum eSpaceImage_OtherUVFilter { typedef struct SpaceText { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ struct Text *text; @@ -1113,8 +1127,11 @@ typedef struct Script { typedef struct SpaceScript { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + struct Script *script; short flags, menunr; @@ -1143,9 +1160,10 @@ typedef struct bNodeTreePath { typedef struct SpaceNode { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -1233,10 +1251,10 @@ enum { typedef struct SpaceLogic { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ short flag, scaflag; int pad; @@ -1276,9 +1294,10 @@ typedef enum eConsoleLine_Type { typedef struct SpaceConsole { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; // XXX are these needed? - short blockhandler[8] DNA_DEPRECATED; // XXX are these needed? + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ /* space vars */ int lheight, pad; @@ -1301,9 +1320,12 @@ typedef struct SpaceConsole { typedef struct SpaceUserPref { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ - char pad[3]; + char _pad1[7]; char filter_type; char filter[64]; /* search term for filtering in the UI */ } SpaceUserPref; @@ -1318,7 +1340,12 @@ typedef struct SpaceUserPref { typedef struct SpaceClip { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char _pad1[4]; float xof, yof; /* user defined offset, image is centered */ float xlockof, ylockof; /* user defined offset from locked position */ diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 6f3cf4e2bec..f7e2a98f66b 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -148,9 +148,10 @@ typedef struct RegionView3D { typedef struct View3D { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale; - short blockhandler[8]; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ float viewquat[4] DNA_DEPRECATED; float dist DNA_DEPRECATED; -- cgit v1.2.3