From 10f724cec5e3e80eb2e790a18aaa54861661adde Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 9 Apr 2019 10:45:39 -0600 Subject: Fix: Build error with msvc. Unused label spawned a warn but bmesh builds with warns as errors. --- source/blender/bmesh/intern/bmesh_mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index f249f076841..16d297b9ee4 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -1241,7 +1241,6 @@ void BM_mesh_elem_index_ensure(BMesh *bm, const char htype) } } -finally: bm->elem_index_dirty &= ~htype; } -- cgit v1.2.3 From cc9528d3c8e71372528471e8071f494cdec067ee Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 10 Apr 2019 15:46:47 +0200 Subject: Buildbot: Attempt to fix wrong branch in buildinfo For some reason the buildinfo header was not re-generated. The root reason is not really clear to me, so simply remove the header similar to the CMake cache. --- build_files/buildbot/slave_compile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 595eacbda80..a339688c06a 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -154,6 +154,12 @@ if 'cmake' in builder: if os.path.exists('CMakeCache.txt'): print("Removing CMake cache") os.remove('CMakeCache.txt') + # Remove buildinfo files to force buildbot to re-generate them. + for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ): + full_path = os.path.join('source', 'creator', buildinfo) + if os.path.exists(full_path): + print("Removing {}" . format(buildinfo)) + os.remove(full_path) retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options) if retcode != 0: print('Configuration FAILED!') -- cgit v1.2.3