From 159806140fd33e6ddab951c0f6f180cfbf927d38 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 16 Apr 2018 14:07:42 +0200 Subject: Removing Blender Game Engine from Blender 2.8 Folders removed entirely: * //extern/recastnavigation * //intern/decklink * //intern/moto * //source/blender/editors/space_logic * //source/blenderplayer * //source/gameengine This includes DNA data and any reference to the BGE code in Blender itself. We are bumping the subversion. Pending tasks: * Tile/clamp code in image editor draw code. * Viewport drawing code (so much of this will go away because of BI removal that we can wait until then to remove this. --- build_files/buildbot/config/blender_linux.cmake | 1 - build_files/buildbot/config/blender_linux_player.cmake | 1 - build_files/cmake/config/blender_full.cmake | 2 -- build_files/cmake/config/blender_headless.cmake | 1 - build_files/cmake/config/blender_lite.cmake | 1 - build_files/cmake/config/blender_release.cmake | 2 -- build_files/cmake/config/bpy_module.cmake | 3 --- build_files/cmake/config/cycles_standalone.cmake | 1 - build_files/cmake/macros.cmake | 4 ---- 9 files changed, 16 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 22e88a82ffd..668f3cd813a 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -23,7 +23,6 @@ endif() # Default to only build Blender, not the player set(WITH_BLENDER ON CACHE BOOL "" FORCE) -set(WITH_PLAYER OFF CACHE BOOL "" FORCE) # ######## Linux-specific build options ######## # Options which are specific to Linux-only platforms diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake index 69ab984e386..77581864575 100644 --- a/build_files/buildbot/config/blender_linux_player.cmake +++ b/build_files/buildbot/config/blender_linux_player.cmake @@ -9,4 +9,3 @@ set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_LIBMV OFF CACHE BOOL "" FORCE) set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index c896c0452b3..635484633c2 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -16,7 +16,6 @@ set(WITH_CYCLES_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) @@ -51,7 +50,6 @@ set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake index cfde86aac6d..8f2ad03279c 100644 --- a/build_files/cmake/config/blender_headless.cmake +++ b/build_files/cmake/config/blender_headless.cmake @@ -6,7 +6,6 @@ # set(WITH_HEADLESS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) # disable audio, its possible some devs may want this but for now disable # so the python module doesnt hold the audio device and loads quickly. diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 1a5e6a3158a..5aa0f4f4bf1 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -21,7 +21,6 @@ set(WITH_CYCLES_OPENSUBDIV OFF CACHE BOOL "" FORCE) set(WITH_FFTW3 OFF CACHE BOOL "" FORCE) set(WITH_LIBMV OFF CACHE BOOL "" FORCE) set(WITH_LLVM OFF CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 26267fd314a..a21c0d43b66 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -16,7 +16,6 @@ set(WITH_CYCLES_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) @@ -51,7 +50,6 @@ set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE) diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake index 854d6e49370..2371d3f0d76 100644 --- a/build_files/cmake/config/bpy_module.cmake +++ b/build_files/cmake/config/bpy_module.cmake @@ -12,9 +12,6 @@ set(WITH_INSTALL_PORTABLE OFF CACHE BOOL "" FORCE) # no point int copying python into python set(WITH_PYTHON_INSTALL OFF CACHE BOOL "" FORCE) -# dont build the game engine -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) - # disable audio, its possible some devs may want this but for now disable # so the python module doesnt hold the audio device and loads quickly. set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/cycles_standalone.cmake b/build_files/cmake/config/cycles_standalone.cmake index 45f9c100f93..1b12f4de23f 100644 --- a/build_files/cmake/config/cycles_standalone.cmake +++ b/build_files/cmake/config/cycles_standalone.cmake @@ -6,7 +6,6 @@ # disable Blender set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -set(WITH_PLAYER OFF CACHE BOOL "" FORCE) set(WITH_CYCLES_BLENDER OFF CACHE BOOL "" FORCE) # build Cycles diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index dcb8103bc10..e581e597fc7 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -760,10 +760,6 @@ function(SETUP_BLENDER_SORTED_LIBS) list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet") endif() - if(WITH_GAMEENGINE_DECKLINK) - list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink) - endif() - if(WIN32) list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect) endif() -- cgit v1.2.3 From 1f24a60a3e3f2d86662a389e2339d43560a55b75 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 17 Apr 2018 18:41:53 +0200 Subject: Remove player from buildbot --- build_files/buildbot/config/blender_linux_player.cmake | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 build_files/buildbot/config/blender_linux_player.cmake (limited to 'build_files') diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake deleted file mode 100644 index 77581864575..00000000000 --- a/build_files/buildbot/config/blender_linux_player.cmake +++ /dev/null @@ -1,11 +0,0 @@ -# This is applied as an override on top of blender_linux.config -# Disables all the areas which are not needed for the player. -set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES OFF CACHE BOOL "" FORCE) -set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) -set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) -set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) -set(WITH_LIBMV OFF CACHE BOOL "" FORCE) - -set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -- cgit v1.2.3 From de6289e79e005dc2b65085c2989cc550b48c6747 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Tue, 17 Apr 2018 18:46:03 +0200 Subject: Remove player from buildbot part II --- build_files/buildbot/config/blender_linux.cmake | 2 +- build_files/buildbot/slave_compile.py | 10 +++------- build_files/buildbot/slave_pack.py | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 668f3cd813a..43f2ff7239d 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -21,7 +21,7 @@ else() message(FATAL_ERROR "Unknown build environment") endif() -# Default to only build Blender, not the player +# Default to only build Blender set(WITH_BLENDER ON CACHE BOOL "" FORCE) # ######## Linux-specific build options ######## diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index ff19bcce758..43964dda691 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -60,7 +60,6 @@ if 'cmake' in builder: # Config file to be used (relative to blender's sources root) cmake_config_file = "build_files/cmake/config/blender_full.cmake" - cmake_player_config_file = None cmake_cuda_config_file = None # Set build options. @@ -101,14 +100,13 @@ if 'cmake' in builder: elif glibc == 'glibc211': deb_name = "squeeze" cmake_config_file = "build_files/buildbot/config/blender_linux.cmake" - cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake" if builder.endswith('x86_64_cmake'): chroot_name = 'buildbot_' + deb_name + '_x86_64' - targets = ['player', 'blender'] + targets = ['blender'] elif builder.endswith('i686_cmake'): bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' - targets = ['player', 'blender'] + targets = ['blender'] cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) @@ -159,9 +157,7 @@ if 'cmake' in builder: os.chdir(target_build_dir) # Tweaking CMake options to respect the target target_cmake_options = cmake_options[:] - if target == 'player': - target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file)) - elif target == 'cuda': + if target == 'cuda': target_cmake_options += cuda_cmake_options target_chroot_prefix = cuda_chroot_prefix[:] target_name = 'cycles_kernel_cuda' diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index a0b5e8c6517..22cf386c77a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -126,7 +126,6 @@ if builder.find('cmake') != -1: elif builder.startswith('linux_'): blender = os.path.join(install_dir, 'blender') - blenderplayer = os.path.join(install_dir, 'blenderplayer') buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h") blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h") @@ -149,7 +148,7 @@ if builder.find('cmake') != -1: # Strip all unused symbols from the binaries print("Stripping binaries...") chroot_prefix = ['schroot', '-c', chroot_name, '--'] - subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer]) + subprocess.call(chroot_prefix + ['strip', '--strip-all', blender]) print("Stripping python...") py_target = os.path.join(install_dir, blender_version) -- cgit v1.2.3 From 5f6c45498c92b91a710a1317f6d41f73fbe83477 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 20 Apr 2018 17:14:03 +0200 Subject: UI: New Global Top-Bar (WIP) == Main Features/Changes for Users * Add horizontal bar at top of all non-temp windows, consisting out of two horizontal sub-bars. * Upper sub-bar contains global menus (File, Render, etc.), tabs for workspaces and scene selector. * Lower sub-bar contains object mode selector, screen-layout and render-layer selector. Later operator and/or tool settings will be placed here. * Individual sections of the topbar are individually scrollable. * Workspace tabs can be double- or ctrl-clicked for renaming and contain 'x' icon for deleting. * Top-bar should scale nicely with DPI. * The lower half of the top-bar can be hided by dragging the lower top-bar edge up. Better hiding options are planned (e.g. hide in fullscreen modes). * Info editors at the top of the window and using the full window width with be replaced by the top-bar. * In fullscreen modes, no more info editor is added on top, the top-bar replaces it. == Technical Features/Changes * Adds initial support for global areas A global area is part of the window, not part of the regular screen-layout. I've added a macro iterator to iterate over both, global and screen-layout level areas. When iterating over areas, from now on developers should always consider if they have to include global areas. * Adds a TOPBAR editor type The editor type is hidden in the UI editor type menu. * Adds a variation of the ID template to display IDs as tab buttons (template_ID_tabs in BPY) * Does various changes to RNA button creation code to improve their appearance in the horizontal top-bar. * Adds support for dynamically sized regions. That is, regions that scale automatically to the layout bounds. The code for this is currently a big hack (it's based on drawing the UI multiple times). This should definitely be improved. * Adds a template for displaying operator properties optimized for the top-bar. This will probably change a lot still and is in fact disabled in code. Since the final top-bar design depends a lot on other 2.8 designs (mainly tool-system and workspaces), we decided to not show the operator or tool settings in the top-bar for now. That means most of the lower sub-bar is empty for the time being. NOTE: Top-bar or global area data is not written to files or SDNA. They are simply added to the window when opening Blender or reading a file. This allows us doing changes to the top-bar without having to care for compatibility. == ToDo's It's a bit hard to predict all the ToDo's here are the known main ones: * Add options for the new active-tool system and for operator redo to the topbar. * Automatically hide the top-bar in fullscreen modes. * General visual polish. * Top-bar drag & drop support (WIP in temp-tab_drag_drop). * Improve dynamic regions (should also fix some layout glitches). * Make internal terminology consistent. * Enable topbar file writing once design is more advanced. * Address TODO's and XXX's in code :) Thanks @brecht for the review! And @sergey for the complaining ;) Differential Revision: D2758 --- build_files/cmake/macros.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index e581e597fc7..23d4d0d2054 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -583,6 +583,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_space_sequencer bf_editor_space_text bf_editor_space_time + bf_editor_space_topbar bf_editor_space_userpref bf_editor_space_view3d bf_editor_space_clip -- cgit v1.2.3