From 2dbb1e9f0eec75e1fa11a573a151690c91a976dd Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 31 Jul 2018 14:22:32 +0200 Subject: [PATCH 1/4] Fix cmake external library build for blosc/freetype on some systems. --- build_files/build_environment/cmake/blosc.cmake | 1 + build_files/build_environment/cmake/freetype.cmake | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 606fe8c61cc..9a5ef745985 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -25,6 +25,7 @@ set(BLOSC_EXTRA_ARGS -DThreads_FOUND=1 -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib -DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc + -DDEACTIVATE_SNAPPY=ON ) ExternalProject_Add(external_blosc diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake index 751b2b1f383..9afc902531b 100644 --- a/build_files/build_environment/cmake/freetype.cmake +++ b/build_files/build_environment/cmake/freetype.cmake @@ -16,7 +16,15 @@ # # ***** END GPL LICENSE BLOCK ***** -set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d -DWITH_BZip2=OFF -DWITH_HarfBuzz=OFF) +set(FREETYPE_EXTRA_ARGS + -DCMAKE_RELEASE_POSTFIX:STRING=2ST + -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d + -DWITH_BZip2=OFF + -DWITH_HarfBuzz=OFF + -DFT_WITH_HARFBUZZ=OFF + -DFT_WITH_BZIP2=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE) ExternalProject_Add(external_freetype URL ${FREETYPE_URI} From d940a081a9f1f4106a5d2d155682695b0a6b0cb6 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Tue, 26 Jun 2018 13:53:54 -0400 Subject: [PATCH 2/4] Gitignore: Ignore diffs in all subdirs --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 814b7661bc6..ff0ba8c2350 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,8 @@ Desktop.ini /BUILD_NOTES.txt # local patches -/*.patch -/*.diff +*.patch +*.diff # in-source doc-gen /doc/doxygen/html/ From d5724bfaa760801377db4d5cc4071aef42491439 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Tue, 31 Jul 2018 13:03:48 -0400 Subject: [PATCH 3/4] Revert "Gitignore: Ignore diffs in all subdirs" This is an issue for some file in the extern dir This reverts commit d940a081a9f1f4106a5d2d155682695b0a6b0cb6. --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ff0ba8c2350..814b7661bc6 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,8 @@ Desktop.ini /BUILD_NOTES.txt # local patches -*.patch -*.diff +/*.patch +/*.diff # in-source doc-gen /doc/doxygen/html/ From e8d58080df07d4b7d9372bfca0dd54ea2817394a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Aug 2018 08:08:59 +1000 Subject: [PATCH 4/4] DNA: remove View3D.flag3 Having 'flag, flag2, flag3' is getting out of hand especially when we support increasing the size of types. Make flag2 into an int. Note, this looses the 'show world' option, but it's not such an important setting. --- .../blender/editors/space_view3d/space_view3d.c | 2 +- source/blender/editors/space_view3d/view3d_draw.c | 4 ++-- source/blender/makesdna/DNA_view3d_types.h | 15 +++++++-------- source/blender/makesrna/intern/rna_space.c | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 63ae3bbb657..7f3a36c7ba6 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1238,7 +1238,7 @@ static void space_view3d_listener(bScreen *UNUSED(sc), ScrArea *sa, struct wmNot switch (wmn->data) { case ND_WORLD_DRAW: case ND_WORLD: - if (v3d->flag3 & V3D_SHOW_WORLD) + if (v3d->flag2 & V3D_SHOW_WORLD) ED_area_tag_redraw_regiontype(sa, RGN_TYPE_WINDOW); break; } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index fbf2bd33638..1cf2e71f2bf 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3091,7 +3091,7 @@ void ED_view3d_draw_offscreen_init(Main *bmain, Scene *scene, View3D *v3d) */ static void view3d_main_region_clear(Scene *scene, View3D *v3d, ARegion *ar) { - if (scene->world && (v3d->flag3 & V3D_SHOW_WORLD)) { + if (scene->world && (v3d->flag2 & V3D_SHOW_WORLD)) { RegionView3D *rv3d = ar->regiondata; GPUMaterial *gpumat = GPU_material_world(scene, scene->world); @@ -3497,7 +3497,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple( v3d.flag2 |= V3D_SOLID_TEX; } if (draw_flags & V3D_OFSDRAW_USE_BACKGROUND) { - v3d.flag3 |= V3D_SHOW_WORLD; + v3d.flag2 |= V3D_SHOW_WORLD; } if (draw_flags & V3D_OFSDRAW_USE_CAMERA_DOF) { if (camera->type == OB_CAMERA) { diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 845e7ab3658..1b3eef0f3ec 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -182,10 +182,11 @@ typedef struct View3D { /** * The drawing mode for the 3d display. Set to OB_BOUNDBOX, OB_WIRE, OB_SOLID, * OB_TEXTURE, OB_MATERIAL or OB_RENDER */ - short drawtype; - short ob_centre_cursor; /* optional bool for 3d cursor to define center */ + char drawtype; + char ob_centre_cursor; /* optional bool for 3d cursor to define center */ short scenelock, around; - short flag, flag2; + short flag; + int flag2; float lens, grid; float near, far; @@ -201,7 +202,7 @@ typedef struct View3D { /* transform widget info */ char twtype, twmode, twflag; - short flag3; + short _pad1; /* afterdraw, for xray & transparent */ struct ListBase afterdraw_transp; @@ -297,7 +298,7 @@ typedef struct View3D { #define RV3D_VIEW_IS_AXIS(view) \ (((view) >= RV3D_VIEW_FRONT) && ((view) <= RV3D_VIEW_BOTTOM)) -/* View3d->flag2 (short) */ +/* View3d->flag2 (int) */ #define V3D_RENDER_OVERRIDE (1 << 2) #define V3D_SOLID_TEX (1 << 3) #define V3D_SHOW_GPENCIL (1 << 4) @@ -312,11 +313,9 @@ typedef struct View3D { #define V3D_SHOW_SOLID_MATCAP (1 << 13) /* runtime flag */ #define V3D_OCCLUDE_WIRE (1 << 14) #define V3D_SHADELESS_TEX (1 << 15) +#define V3D_SHOW_WORLD (1 << 16) -/* View3d->flag3 (short) */ -#define V3D_SHOW_WORLD (1 << 0) - /* View3D->around */ enum { /* center of the bounding box */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 813e847aae6..ae1761faec1 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2621,7 +2621,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_world", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag3", V3D_SHOW_WORLD); + RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SHOW_WORLD); RNA_def_property_ui_text(prop, "World Background", "Display world colors in the background"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);