tag active viewer

build_files/build_environment/cmake/embree.cmake

@@ -43,12 +43,6 @@ endif()
 
 if(WIN32)
   set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
-  if(BUILD_MODE STREQUAL Debug)
-    list(APPEND EMBREE_EXTRA_ARGS
-     -DEMBREE_TBBMALLOC_LIBRARY_NAME=tbbmalloc_debug
-     -DEMBREE_TBB_LIBRARY_NAME=tbb_debug
-    )
-  endif()
 else()
   set(EMBREE_BUILD_DIR)
 endif()

build_files/build_environment/cmake/tbb.cmake

@@ -22,7 +22,6 @@ if(WIN32)
     -DTBB_BUILD_TBBMALLOC_PROXY=On
     -DTBB_BUILD_STATIC=Off
     -DTBB_BUILD_TESTS=Off
-    -DCMAKE_DEBUG_POSTFIX=_debug
   )
   set(TBB_LIBRARY tbb)
   set(TBB_STATIC_LIBRARY Off)
@@ -56,17 +55,17 @@ if(WIN32)
     ExternalProject_Add_Step(external_tbb after_install
       # findtbb.cmake in some deps *NEEDS* to find tbb_debug.lib even if they are not going to use it
       # to make that test pass, we place a copy with the right name in the lib folder.
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${LIBDIR}/tbb/lib/tbb_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${LIBDIR}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.dll ${HARVEST_TARGET}/tbb/lib/tbb_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.dll
       # Normal collection of build artifacts
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${HARVEST_TARGET}/tbb/bin/tbb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.dll ${HARVEST_TARGET}/tbb/lib/tbb.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.dll
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
       DEPENDEES install
     )
@@ -77,11 +76,11 @@ if(WIN32)
       # to make that test pass, we place a copy with the right name in the lib folder.
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${LIBDIR}/tbb/lib/tbb.lib
       # Normal collection of build artifacts
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb_debug.dll ${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/debug/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.dll ${HARVEST_TARGET}/tbb/lib/debug/tbb_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc_proxy.dll
       DEPENDEES install
     )
   endif()

build_files/cmake/macros.cmake

@@ -596,6 +596,14 @@ function(SETUP_LIBDIRS)
       link_directories(${GMP_LIBPATH})
     endif()
 
+    if(WITH_GHOST_WAYLAND)
+      link_directories(
+        ${wayland-client_LIBRARY_DIRS}
+        ${wayland-egl_LIBRARY_DIRS}
+        ${xkbcommon_LIBRARY_DIRS}
+        ${wayland-cursor_LIBRARY_DIRS})
+    endif()
+
     if(WIN32 AND NOT UNIX)
       link_directories(${PTHREADS_LIBPATH})
     endif()

build_files/cmake/platform/platform_unix.cmake

@@ -575,17 +575,17 @@ if(WITH_GHOST_WAYLAND)
   pkg_check_modules(wayland-scanner REQUIRED wayland-scanner)
   pkg_check_modules(xkbcommon REQUIRED xkbcommon)
   pkg_check_modules(wayland-cursor REQUIRED wayland-cursor)
-  pkg_check_modules(dbus REQUIRED dbus-1)
 
   set(WITH_GL_EGL ON)
 
-  list(APPEND PLATFORM_LINKLIBS
-    ${wayland-client_LINK_LIBRARIES}
-    ${wayland-egl_LINK_LIBRARIES}
-    ${xkbcommon_LINK_LIBRARIES}
-    ${wayland-cursor_LINK_LIBRARIES}
-    ${dbus_LINK_LIBRARIES}
-  )
+  if(WITH_GHOST_WAYLAND)
+    list(APPEND PLATFORM_LINKLIBS
+      ${wayland-client_LIBRARIES}
+      ${wayland-egl_LIBRARIES}
+      ${xkbcommon_LIBRARIES}
+      ${wayland-cursor_LIBRARIES}
+    )
+  endif()
 endif()
 
 if(WITH_GHOST_X11)

build_files/cmake/platform/platform_win32.cmake

@@ -675,7 +675,7 @@ if(WITH_SYSTEM_AUDASPACE)
 endif()
 
 if(WITH_TBB)
-  set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
+  set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/debug/tbb_debug.lib)
   set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
   set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})
   if(WITH_TBB_MALLOC_PROXY)

build_files/cmake/platform/platform_win32_bundle_crt.cmake

@@ -15,15 +15,6 @@ if(WITH_WINDOWS_BUNDLE_CRT)
 
   include(InstallRequiredSystemLibraries)
 
-  # ucrtbase(d).dll cannot be in the manifest, due to the way windows 10 handles
-  # redirects for this dll, for details see T88813.
-  foreach(lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS})
-    string(FIND ${lib} "ucrtbase" pos)
-    if(NOT pos EQUAL -1)
-      list(REMOVE_ITEM CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
-      install(FILES ${lib} DESTINATION . COMPONENT Libraries)
-    endif()
-  endforeach()
   # Install the CRT to the blender.crt Sub folder.
   install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ./blender.crt COMPONENT Libraries)
 

build_files/config/pipeline_config.json

@@ -11,7 +11,7 @@
                 { "path": "source/tools", "branch": "master", "commit_id": "HEAD" }
             ]
         },
-        "svn":
+        "svn": 
         {
             "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
             "libraries":
@@ -47,7 +47,7 @@
         "cmake":
         {
             "default":
-            {
+            { 
                 "version": "any",
                 "overrides":
                 {
@@ -58,28 +58,28 @@
             {
                 "overrides":
                 {
-
+    
                 }
             },
             "darwin-arm64":
             {
                 "overrides":
                 {
-
+    
                 }
             },
             "linux-x86_64":
             {
                 "overrides":
                 {
-
+    
                 }
             },
             "windows-amd64":
             {
                 "overrides":
                 {
-
+    
                 }
             }
         }

intern/cycles/kernel/shaders/node_vector_math.osl

@@ -52,9 +52,6 @@ shader node_vector_math(string math_type = "add",
   else if (math_type == "faceforward") {
     Vector = compatible_faceforward(Vector1, Vector2, Vector3);
   }
-  else if (math_type == "multiply_add") {
-    Vector = Vector1 * Vector2 + Vector3;
-  }
   else if (math_type == "dot_product") {
     Value = dot(Vector1, Vector2);
   }

intern/cycles/kernel/svm/svm_math.h

@@ -58,8 +58,7 @@ ccl_device void svm_node_vector_math(KernelGlobals *kg,
   float3 vector;
 
   /* 3 Vector Operators */
-  if (type == NODE_VECTOR_MATH_WRAP || type == NODE_VECTOR_MATH_FACEFORWARD ||
-      type == NODE_VECTOR_MATH_MULTIPLY_ADD) {
+  if (type == NODE_VECTOR_MATH_WRAP || type == NODE_VECTOR_MATH_FACEFORWARD) {
     uint4 extra_node = read_node(kg, offset);
     c = stack_load_float3(stack, extra_node.x);
   }

intern/cycles/kernel/svm/svm_math_util.h

@@ -52,9 +52,6 @@ ccl_device void svm_vector_math(float *value,
     case NODE_VECTOR_MATH_FACEFORWARD:
       *vector = faceforward(a, b, c);
       break;
-    case NODE_VECTOR_MATH_MULTIPLY_ADD:
-      *vector = a * b + c;
-      break;
     case NODE_VECTOR_MATH_DOT_PRODUCT:
       *value = dot(a, b);
       break;

intern/cycles/kernel/svm/svm_types.h

@@ -341,7 +341,6 @@ typedef enum NodeVectorMathType {
   NODE_VECTOR_MATH_TANGENT,
   NODE_VECTOR_MATH_REFRACT,
   NODE_VECTOR_MATH_FACEFORWARD,
-  NODE_VECTOR_MATH_MULTIPLY_ADD,
 } NodeVectorMathType;
 
 typedef enum NodeClampType {

intern/cycles/render/nodes.cpp

@@ -6093,7 +6093,6 @@ NODE_DEFINE(VectorMathNode)
   type_enum.insert("reflect", NODE_VECTOR_MATH_REFLECT);
   type_enum.insert("refract", NODE_VECTOR_MATH_REFRACT);
   type_enum.insert("faceforward", NODE_VECTOR_MATH_FACEFORWARD);
-  type_enum.insert("multiply_add", NODE_VECTOR_MATH_MULTIPLY_ADD);
 
   type_enum.insert("dot_product", NODE_VECTOR_MATH_DOT_PRODUCT);
 
@@ -6166,8 +6165,7 @@ void VectorMathNode::compile(SVMCompiler &compiler)
   int vector_stack_offset = compiler.stack_assign_if_linked(vector_out);
 
   /* 3 Vector Operators */
-  if (math_type == NODE_VECTOR_MATH_WRAP || math_type == NODE_VECTOR_MATH_FACEFORWARD ||
-      math_type == NODE_VECTOR_MATH_MULTIPLY_ADD) {
+  if (math_type == NODE_VECTOR_MATH_WRAP || math_type == NODE_VECTOR_MATH_FACEFORWARD) {
     ShaderInput *vector3_in = input("Vector3");
     int vector3_stack_offset = compiler.stack_assign(vector3_in);
     compiler.add_node(

intern/ghost/CMakeLists.txt

@@ -282,7 +282,6 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       ${wayland-egl_INCLUDE_DIRS}
       ${xkbcommon_INCLUDE_DIRS}
       ${wayland-cursor_INCLUDE_DIRS}
-      ${dbus_INCLUDE_DIRS}
     )
 
     list(APPEND SRC
@@ -322,11 +321,6 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
       xdg-shell
       "${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml"
     )
-    # xdg-decoration.
-    generate_protocol_bindings(
-      xdg-decoration
-      "${WAYLAND_PROTOCOLS_DIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml"
-    )
     # Pointer-constraints.
     generate_protocol_bindings(
       pointer-constraints

intern/ghost/intern/GHOST_SystemWayland.cpp

@@ -40,7 +40,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "GHOST_WaylandCursorSettings.h"
 #include <pointer-constraints-client-protocol.h>
 #include <relative-pointer-client-protocol.h>
 #include <wayland-cursor.h>
@@ -53,6 +52,15 @@
 
 #include <cstring>
 
+struct output_t {
+  struct wl_output *output;
+  int32_t width, height;
+  int transform;
+  int scale;
+  std::string make;
+  std::string model;
+};
+
 struct buffer_t {
   void *data;
   size_t size;
@@ -64,12 +72,6 @@ struct cursor_t {
   struct wl_buffer *buffer;
   struct wl_cursor_image image;
   struct buffer_t *file_buffer = nullptr;
-  struct wl_cursor_theme *theme = nullptr;
-  int size;
-  std::string theme_name;
-  // outputs on which the cursor is visible
-  std::unordered_set<const output_t *> outputs;
-  int scale = 1;
 };
 
 struct data_offer_t {
@@ -140,14 +142,10 @@ struct display_t {
   struct wl_display *display;
   struct wl_compositor *compositor = nullptr;
   struct xdg_wm_base *xdg_shell = nullptr;
-  struct zxdg_decoration_manager_v1 *xdg_decoration_manager = nullptr;
   struct wl_shm *shm = nullptr;
   std::vector<output_t *> outputs;
   std::vector<input_t *> inputs;
-  struct {
-    std::string theme;
-    int size;
-  } cursor;
+  struct wl_cursor_theme *cursor_theme = nullptr;
   struct wl_data_device_manager *data_device_manager = nullptr;
   struct zwp_relative_pointer_manager_v1 *relative_pointer_manager = nullptr;
   struct zwp_pointer_constraints_v1 *pointer_constraints = nullptr;
@@ -156,8 +154,6 @@ struct display_t {
   std::vector<struct wl_egl_window *> os_egl_windows;
 };
 
-static GHOST_WindowManager *window_manager = nullptr;
-
 static void display_destroy(display_t *d)
 {
   if (d->data_device_manager) {
@@ -192,9 +188,6 @@ static void display_destroy(display_t *d)
       if (input->cursor.surface) {
         wl_surface_destroy(input->cursor.surface);
       }
-      if (input->cursor.theme) {
-        wl_cursor_theme_destroy(input->cursor.theme);
-      }
       if (input->pointer) {
         wl_pointer_destroy(input->pointer);
       }
@@ -217,6 +210,10 @@ static void display_destroy(display_t *d)
     delete input;
   }
 
+  if (d->cursor_theme) {
+    wl_cursor_theme_destroy(d->cursor_theme);
+  }
+
   if (d->shm) {
     wl_shm_destroy(d->shm);
   }
@@ -241,10 +238,6 @@ static void display_destroy(display_t *d)
     wl_compositor_destroy(d->compositor);
   }
 
-  if (d->xdg_decoration_manager) {
-    zxdg_decoration_manager_v1_destroy(d->xdg_decoration_manager);
-  }
-
   if (d->xdg_shell) {
     xdg_wm_base_destroy(d->xdg_shell);
   }
@@ -485,9 +478,7 @@ static void dnd_events(const input_t *const input, const GHOST_TEventType event)
 static std::string read_pipe(data_offer_t *data_offer, const std::string mime_receive)
 {
   int pipefd[2];
-  if (pipe(pipefd) != 0) {
-    return {};
-  }
+  pipe(pipefd);
   wl_data_offer_receive(data_offer->id, mime_receive.c_str(), pipefd[1]);
   close(pipefd[1]);
 
@@ -522,9 +513,7 @@ static void data_source_send(void *data,
                              int32_t fd)
 {
   const char *const buffer = static_cast<char *>(data);
-  if (write(fd, buffer, strlen(buffer) + 1) < 0) {
-    GHOST_PRINT("error writing to clipboard: " << std::strerror(errno) << std::endl);
-  }
+  write(fd, buffer, strlen(buffer) + 1);
   close(fd);
 }
 
@@ -800,80 +789,13 @@ static void cursor_buffer_release(void *data, struct wl_buffer *wl_buffer)
   cursor_t *cursor = static_cast<cursor_t *>(data);
 
   wl_buffer_destroy(wl_buffer);
-
-  if (wl_buffer == cursor->buffer) {
-    /* the mapped buffer was from a custom cursor */
-    cursor->buffer = nullptr;
-  }
+  cursor->buffer = nullptr;
 }
 
 const struct wl_buffer_listener cursor_buffer_listener = {
     cursor_buffer_release,
 };
 
-static GHOST_IWindow *get_window(struct wl_surface *surface)
-{
-  if (!surface) {
-    return nullptr;
-  }
-
-  for (GHOST_IWindow *win : window_manager->getWindows()) {
-    if (surface == static_cast<const GHOST_WindowWayland *>(win)->surface()) {
-      return win;
-    }
-  }
-  return nullptr;
-}
-
-static bool update_cursor_scale(cursor_t &cursor, wl_shm *shm)
-{
-  int scale = 0;
-  for (const output_t *output : cursor.outputs) {
-    if (output->scale > scale)
-      scale = output->scale;
-  }
-
-  if (scale > 0 && cursor.scale != scale) {
-    cursor.scale = scale;
-    wl_surface_set_buffer_scale(cursor.surface, scale);
-    wl_cursor_theme_destroy(cursor.theme);
-    cursor.theme = wl_cursor_theme_load(cursor.theme_name.c_str(), scale * cursor.size, shm);
-    return true;
-  }
-  return false;
-}
-
-static void cursor_surface_enter(void *data,
-                                 struct wl_surface * /*wl_surface*/,
-                                 struct wl_output *output)
-{
-  input_t *input = static_cast<input_t *>(data);
-  for (const output_t *reg_output : input->system->outputs()) {
-    if (reg_output->output == output) {
-      input->cursor.outputs.insert(reg_output);
-    }
-  }
-  update_cursor_scale(input->cursor, input->system->shm());
-}
-
-static void cursor_surface_leave(void *data,
-                                 struct wl_surface * /*wl_surface*/,
-                                 struct wl_output *output)
-{
-  input_t *input = static_cast<input_t *>(data);
-  for (const output_t *reg_output : input->system->outputs()) {
-    if (reg_output->output == output) {
-      input->cursor.outputs.erase(reg_output);
-    }
-  }
-  update_cursor_scale(input->cursor, input->system->shm());
-}
-
-struct wl_surface_listener cursor_surface_listener = {
-    cursor_surface_enter,
-    cursor_surface_leave,
-};
-
 static void pointer_enter(void *data,
                           struct wl_pointer * /*wl_pointer*/,
                           uint32_t serial,
@@ -881,28 +803,22 @@ static void pointer_enter(void *data,
                           wl_fixed_t surface_x,
                           wl_fixed_t surface_y)
 {
-  GHOST_WindowWayland *win = static_cast<GHOST_WindowWayland *>(get_window(surface));
-
-  if (!win) {
+  if (!surface) {
     return;
   }
-
-  win->activate();
-
   input_t *input = static_cast<input_t *>(data);
   input->pointer_serial = serial;
-  input->x = win->scale() * wl_fixed_to_int(surface_x);
-  input->y = win->scale() * wl_fixed_to_int(surface_y);
+  input->x = wl_fixed_to_int(surface_x);
+  input->y = wl_fixed_to_int(surface_y);
   input->focus_pointer = surface;
 
-  win->setCursorShape(win->getCursorShape());
-
-  input->system->pushEvent(new GHOST_EventCursor(input->system->getMilliSeconds(),
-                                                 GHOST_kEventCursorMove,
-                                                 static_cast<GHOST_WindowWayland *>(win),
-                                                 input->x,
-                                                 input->y,
-                                                 GHOST_TABLET_DATA_NONE));
+  input->system->pushEvent(
+      new GHOST_EventCursor(input->system->getMilliSeconds(),
+                            GHOST_kEventCursorMove,
+                            static_cast<GHOST_WindowWayland *>(wl_surface_get_user_data(surface)),
+                            input->x,
+                            input->y,
+                            GHOST_TABLET_DATA_NONE));
 }
 
 static void pointer_leave(void *data,
@@ -910,14 +826,9 @@ static void pointer_leave(void *data,
                           uint32_t /*serial*/,
                           struct wl_surface *surface)
 {
-  GHOST_IWindow *win = get_window(surface);
-
-  if (!win) {
-    return;
+  if (surface != nullptr) {
+    static_cast<input_t *>(data)->focus_pointer = nullptr;
   }
-
-  static_cast<input_t *>(data)->focus_pointer = nullptr;
-  static_cast<GHOST_WindowWayland *>(win)->deactivate();
 }
 
 static void pointer_motion(void *data,
@@ -928,20 +839,21 @@ static void pointer_motion(void *data,
 {
   input_t *input = static_cast<input_t *>(data);
 
-  GHOST_WindowWayland *win = static_cast<GHOST_WindowWayland *>(get_window(input->focus_pointer));
+  GHOST_IWindow *win = static_cast<GHOST_WindowWayland *>(
+      wl_surface_get_user_data(input->focus_pointer));
 
   if (!win) {
     return;
   }
 
-  input->x = win->scale() * wl_fixed_to_int(surface_x);
-  input->y = win->scale() * wl_fixed_to_int(surface_y);
+  input->x = wl_fixed_to_int(surface_x);
+  input->y = wl_fixed_to_int(surface_y);
 
   input->system->pushEvent(new GHOST_EventCursor(input->system->getMilliSeconds(),
                                                  GHOST_kEventCursorMove,
                                                  win,
-                                                 input->x,
-                                                 input->y,
+                                                 wl_fixed_to_int(surface_x),
+                                                 wl_fixed_to_int(surface_y),
                                                  GHOST_TABLET_DATA_NONE));
 }
 
@@ -952,14 +864,6 @@ static void pointer_button(void *data,
                            uint32_t button,
                            uint32_t state)
 {
-  input_t *input = static_cast<input_t *>(data);
-
-  GHOST_IWindow *win = get_window(input->focus_pointer);
-
-  if (!win) {
-    return;
-  }
-
   GHOST_TEventType etype = GHOST_kEventUnknown;
   switch (state) {
     case WL_POINTER_BUTTON_STATE_RELEASED:
@@ -983,6 +887,9 @@ static void pointer_button(void *data,
       break;
   }
 
+  input_t *input = static_cast<input_t *>(data);
+  GHOST_IWindow *win = static_cast<GHOST_WindowWayland *>(
+      wl_surface_get_user_data(input->focus_pointer));
   input->data_source->source_serial = serial;
   input->buttons.set(ebutton, state == WL_POINTER_BUTTON_STATE_PRESSED);
   input->system->pushEvent(new GHOST_EventButton(
@@ -995,18 +902,12 @@ static void pointer_axis(void *data,
                          uint32_t axis,
                          wl_fixed_t value)
 {
-  input_t *input = static_cast<input_t *>(data);
-
-  GHOST_IWindow *win = get_window(input->focus_pointer);
-
-  if (!win) {
-    return;
-  }
-
   if (axis != WL_POINTER_AXIS_VERTICAL_SCROLL) {
     return;
   }
-
+  input_t *input = static_cast<input_t *>(data);
+  GHOST_IWindow *win = static_cast<GHOST_WindowWayland *>(
+      wl_surface_get_user_data(input->focus_pointer));
   input->system->pushEvent(
       new GHOST_EventWheel(input->system->getMilliSeconds(), win, std::signbit(value) ? +1 : -1));
 }
@@ -1236,12 +1137,7 @@ static void seat_capabilities(void *data, struct wl_seat *wl_seat, uint32_t capa
     input->cursor.visible = true;
     input->cursor.buffer = nullptr;
     input->cursor.file_buffer = new buffer_t;
-    if (!get_cursor_settings(input->cursor.theme_name, input->cursor.size)) {
-      input->cursor.theme_name = std::string();
-      input->cursor.size = default_cursor_size;
-    }
     wl_pointer_add_listener(input->pointer, &pointer_listener, data);
-    wl_surface_add_listener(input->cursor.surface, &cursor_surface_listener, data);
   }
 
   if (capabilities & WL_SEAT_CAPABILITY_KEYBOARD) {
@@ -1264,8 +1160,8 @@ static void output_geometry(void *data,
                             struct wl_output * /*wl_output*/,
                             int32_t /*x*/,
                             int32_t /*y*/,
-                            int32_t physical_width,
-                            int32_t physical_height,
+                            int32_t /*physical_width*/,
+                            int32_t /*physical_height*/,
                             int32_t /*subpixel*/,
                             const char *make,
                             const char *model,
@@ -1275,8 +1171,6 @@ static void output_geometry(void *data,
   output->transform = transform;
   output->make = std::string(make);
   output->model = std::string(model);
-  output->width_mm = physical_width;
-  output->height_mm = physical_height;
 }
 
 static void output_mode(void *data,
@@ -1287,8 +1181,8 @@ static void output_mode(void *data,
                         int32_t /*refresh*/)
 {
   output_t *output = static_cast<output_t *>(data);
-  output->width_pxl = width;
-  output->height_pxl = height;
+  output->width = width;
+  output->height = height;
 }
 
 /**
@@ -1333,17 +1227,13 @@ static void global_add(void *data,
   struct display_t *display = static_cast<struct display_t *>(data);
   if (!strcmp(interface, wl_compositor_interface.name)) {
     display->compositor = static_cast<wl_compositor *>(
-        wl_registry_bind(wl_registry, name, &wl_compositor_interface, 3));
+        wl_registry_bind(wl_registry, name, &wl_compositor_interface, 1));
   }
   else if (!strcmp(interface, xdg_wm_base_interface.name)) {
     display->xdg_shell = static_cast<xdg_wm_base *>(
         wl_registry_bind(wl_registry, name, &xdg_wm_base_interface, 1));
     xdg_wm_base_add_listener(display->xdg_shell, &shell_listener, nullptr);
   }
-  else if (!strcmp(interface, zxdg_decoration_manager_v1_interface.name)) {
-    display->xdg_decoration_manager = static_cast<zxdg_decoration_manager_v1 *>(
-        wl_registry_bind(wl_registry, name, &zxdg_decoration_manager_v1_interface, 1));
-  }
   else if (!strcmp(interface, wl_output_interface.name)) {
     output_t *output = new output_t;
     output->scale = 1;
@@ -1445,6 +1335,16 @@ GHOST_SystemWayland::GHOST_SystemWayland() : GHOST_System(), d(new display_t)
       wl_data_device_add_listener(input->data_device, &data_device_listener, input);
     }
   }
+
+  const char *theme = std::getenv("XCURSOR_THEME");
+  const char *size = std::getenv("XCURSOR_SIZE");
+  const int sizei = size ? std::stoi(size) : default_cursor_size;
+
+  d->cursor_theme = wl_cursor_theme_load(theme, sizei, d->shm);
+  if (!d->cursor_theme) {
+    display_destroy(d);
+    throw std::runtime_error("Wayland: unable to access cursor themes!");
+  }
 }
 
 GHOST_SystemWayland::~GHOST_SystemWayland()
@@ -1571,8 +1471,8 @@ void GHOST_SystemWayland::getMainDisplayDimensions(GHOST_TUns32 &width, GHOST_TU
 {
   if (getNumDisplays() > 0) {
     /* We assume first output as main. */
-    width = uint32_t(d->outputs[0]->width_pxl) / d->outputs[0]->scale;
-    height = uint32_t(d->outputs[0]->height_pxl) / d->outputs[0]->scale;
+    width = uint32_t(d->outputs[0]->width);
+    height = uint32_t(d->outputs[0]->height);
   }
 }
 
@@ -1581,7 +1481,7 @@ void GHOST_SystemWayland::getAllDisplayDimensions(GHOST_TUns32 &width, GHOST_TUn
   getMainDisplayDimensions(width, height);
 }
 
-GHOST_IContext *GHOST_SystemWayland::createOffscreenContext(GHOST_GLSettings /*glSettings*/)
+GHOST_IContext *GHOST_SystemWayland::createOffscreenContext(GHOST_GLSettings glSettings)
 {
   /* Create new off-screen window. */
   wl_surface *os_surface = wl_compositor_create_surface(compositor());
@@ -1630,11 +1530,6 @@ GHOST_IWindow *GHOST_SystemWayland::createWindow(const char *title,
                                                  const bool is_dialog,
                                                  const GHOST_IWindow *parentWindow)
 {
-  /* globally store pointer to window manager */
-  if (!window_manager) {
-    window_manager = getWindowManager();
-  }
-
   GHOST_WindowWayland *window = new GHOST_WindowWayland(
       this,
       title,
@@ -1679,21 +1574,6 @@ xdg_wm_base *GHOST_SystemWayland::shell()
   return d->xdg_shell;
 }
 
-zxdg_decoration_manager_v1 *GHOST_SystemWayland::decoration_manager()
-{
-  return d->xdg_decoration_manager;
-}
-
-const std::vector<output_t *> &GHOST_SystemWayland::outputs() const
-{
-  return d->outputs;
-}
-
-wl_shm *GHOST_SystemWayland::shm() const
-{
-  return d->shm;
-}
-
 void GHOST_SystemWayland::setSelection(const std::string &selection)
 {
   this->selection = selection;
@@ -1701,20 +1581,23 @@ void GHOST_SystemWayland::setSelection(const std::string &selection)
 
 static void set_cursor_buffer(input_t *input, wl_buffer *buffer)
 {
-  cursor_t *c = &input->cursor;
+  input->cursor.visible = (buffer != nullptr);
 
-  c->visible = (buffer != nullptr);
+  wl_surface_attach(input->cursor.surface, buffer, 0, 0);
+  wl_surface_commit(input->cursor.surface);
 
-  wl_surface_attach(c->surface, buffer, 0, 0);
-
-  wl_surface_damage(c->surface, 0, 0, int32_t(c->image.width), int32_t(c->image.height));
-  wl_pointer_set_cursor(input->pointer,
-                        input->pointer_serial,
-                        c->visible ? c->surface : nullptr,
-                        int32_t(c->image.hotspot_x) / c->scale,
-                        int32_t(c->image.hotspot_y) / c->scale);
-
-  wl_surface_commit(c->surface);
+  if (input->cursor.visible) {
+    wl_surface_damage(input->cursor.surface,
+                      0,
+                      0,
+                      int32_t(input->cursor.image.width),
+                      int32_t(input->cursor.image.height));
+    wl_pointer_set_cursor(input->pointer,
+                          input->pointer_serial,
+                          input->cursor.surface,
+                          int32_t(input->cursor.image.hotspot_x),
+                          int32_t(input->cursor.image.hotspot_y));
+  }
 }
 
 GHOST_TSuccess GHOST_SystemWayland::setCursorShape(GHOST_TStandardCursor shape)
@@ -1725,15 +1608,7 @@ GHOST_TSuccess GHOST_SystemWayland::setCursorShape(GHOST_TStandardCursor shape)
   const std::string cursor_name = cursors.count(shape) ? cursors.at(shape) :
                                                          cursors.at(GHOST_kStandardCursorDefault);
 
-  input_t *input = d->inputs[0];
-  cursor_t *c = &input->cursor;
-
-  if (!c->theme) {
-    /* The cursor surface hasn't entered an output yet. Initialize theme with scale 1. */
-    c->theme = wl_cursor_theme_load(c->theme_name.c_str(), c->size, d->inputs[0]->system->shm());
-  }
-
-  wl_cursor *cursor = wl_cursor_theme_get_cursor(c->theme, cursor_name.c_str());
+  wl_cursor *cursor = wl_cursor_theme_get_cursor(d->cursor_theme, cursor_name.c_str());
 
   if (!cursor) {
     GHOST_PRINT("cursor '" << cursor_name << "' does not exist" << std::endl);
@@ -1745,11 +1620,11 @@ GHOST_TSuccess GHOST_SystemWayland::setCursorShape(GHOST_TStandardCursor shape)
   if (!buffer) {
     return GHOST_kFailure;
   }
-
+  cursor_t *c = &d->inputs[0]->cursor;
   c->buffer = buffer;
   c->image = *image;
 
-  set_cursor_buffer(input, buffer);
+  set_cursor_buffer(d->inputs[0], buffer);
 
   return GHOST_kSuccess;
 }
@@ -1860,11 +1735,6 @@ GHOST_TSuccess GHOST_SystemWayland::setCursorVisibility(bool visible)
 GHOST_TSuccess GHOST_SystemWayland::setCursorGrab(const GHOST_TGrabCursorMode mode,
                                                   wl_surface *surface)
 {
-  /* ignore, if the required protocols are not supported */
-  if (!d->relative_pointer_manager || !d->pointer_constraints) {
-    return GHOST_kFailure;
-  }
-
   if (d->inputs.empty()) {
     return GHOST_kFailure;
   }
@@ -1884,7 +1754,6 @@ GHOST_TSuccess GHOST_SystemWayland::setCursorGrab(const GHOST_TGrabCursorMode mo
       break;
 
     case GHOST_kGrabNormal:
-      break;
     case GHOST_kGrabWrap:
       input->relative_pointer = zwp_relative_pointer_manager_v1_get_relative_pointer(
           d->relative_pointer_manager, input->pointer);

intern/ghost/intern/GHOST_SystemWayland.h

@@ -26,7 +26,6 @@
 #include "GHOST_WindowWayland.h"
 
 #include <wayland-client.h>
-#include <xdg-decoration-client-protocol.h>
 #include <xdg-shell-client-protocol.h>
 
 #include <string>
@@ -35,16 +34,6 @@ class GHOST_WindowWayland;
 
 struct display_t;
 
-struct output_t {
-  struct wl_output *output;
-  int32_t width_pxl, height_pxl;  // dimensions in pixel
-  int32_t width_mm, height_mm;    // dimensions in millimeter
-  int transform;
-  int scale;
-  std::string make;
-  std::string model;
-};
-
 class GHOST_SystemWayland : public GHOST_System {
  public:
   GHOST_SystemWayland();
@@ -95,12 +84,6 @@ class GHOST_SystemWayland : public GHOST_System {
 
   xdg_wm_base *shell();
 
-  zxdg_decoration_manager_v1 *decoration_manager();
-
-  const std::vector<output_t *> &outputs() const;
-
-  wl_shm *shm() const;
-
   void setSelection(const std::string &selection);
 
   GHOST_TSuccess setCursorShape(GHOST_TStandardCursor shape);

intern/ghost/intern/GHOST_WaylandCursorSettings.h

@@ -1,130 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/** \file
- * \ingroup GHOST
- */
-
-#pragma once
-#include <dbus/dbus.h>
-#include <string>
-
-static DBusMessage *get_setting_sync(DBusConnection *const connection,
-                                     const char *key,
-                                     const char *value)
-{
-  DBusError error;
-  dbus_bool_t success;
-  DBusMessage *message;
-  DBusMessage *reply;
-
-  dbus_error_init(&error);
-
-  message = dbus_message_new_method_call("org.freedesktop.portal.Desktop",
-                                         "/org/freedesktop/portal/desktop",
-                                         "org.freedesktop.portal.Settings",
-                                         "Read");
-
-  success = dbus_message_append_args(
-      message, DBUS_TYPE_STRING, &key, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);
-
-  if (!success) {
-    return NULL;
-  }
-
-  reply = dbus_connection_send_with_reply_and_block(
-      connection, message, DBUS_TIMEOUT_USE_DEFAULT, &error);
-
-  dbus_message_unref(message);
-
-  if (dbus_error_is_set(&error)) {
-    return NULL;
-  }
-
-  return reply;
-}
-
-static bool parse_type(DBusMessage *const reply, const int type, void *value)
-{
-  DBusMessageIter iter[3];
-
-  dbus_message_iter_init(reply, &iter[0]);
-  if (dbus_message_iter_get_arg_type(&iter[0]) != DBUS_TYPE_VARIANT) {
-    return false;
-  }
-
-  dbus_message_iter_recurse(&iter[0], &iter[1]);
-  if (dbus_message_iter_get_arg_type(&iter[1]) != DBUS_TYPE_VARIANT) {
-    return false;
-  }
-
-  dbus_message_iter_recurse(&iter[1], &iter[2]);
-  if (dbus_message_iter_get_arg_type(&iter[2]) != type) {
-    return false;
-  }
-
-  dbus_message_iter_get_basic(&iter[2], value);
-
-  return true;
-}
-
-static bool get_cursor_settings(std::string &theme, int &size)
-{
-  static const char name[] = "org.gnome.desktop.interface";
-  static const char key_theme[] = "cursor-theme";
-  static const char key_size[] = "cursor-size";
-
-  DBusError error;
-  DBusConnection *connection;
-  DBusMessage *reply;
-  const char *value_theme = NULL;
-
-  dbus_error_init(&error);
-
-  connection = dbus_bus_get(DBUS_BUS_SESSION, &error);
-
-  if (dbus_error_is_set(&error)) {
-    return false;
-  }
-
-  reply = get_setting_sync(connection, name, key_theme);
-  if (!reply) {
-    return false;
-  }
-
-  if (!parse_type(reply, DBUS_TYPE_STRING, &value_theme)) {
-    dbus_message_unref(reply);
-    return false;
-  }
-
-  theme = std::string(value_theme);
-
-  dbus_message_unref(reply);
-
-  reply = get_setting_sync(connection, name, key_size);
-  if (!reply) {
-    return false;
-  }
-
-  if (!parse_type(reply, DBUS_TYPE_INT32, &size)) {
-    dbus_message_unref(reply);
-    return false;
-  }
-
-  dbus_message_unref(reply);
-
-  return true;
-}

intern/ghost/intern/GHOST_WindowWayland.cpp

@@ -29,19 +29,11 @@
 
 #include <wayland-egl.h>
 
-static constexpr size_t base_dpi = 96;
-
 struct window_t {
   GHOST_WindowWayland *w;
   wl_surface *surface;
-  // outputs on which the window is currently shown on
-  std::unordered_set<const output_t *> outputs;
-  GHOST_TUns16 dpi = 0;
-  int scale = 1;
   struct xdg_surface *xdg_surface;
   struct xdg_toplevel *xdg_toplevel;
-  struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration = nullptr;
-  enum zxdg_toplevel_decoration_v1_mode decoration_mode;
   wl_egl_window *egl_window;
   int32_t pending_width, pending_height;
   bool is_maximised;
@@ -101,30 +93,17 @@ static const xdg_toplevel_listener toplevel_listener = {
     toplevel_close,
 };
 
-static void toplevel_decoration_configure(
-    void *data,
-    struct zxdg_toplevel_decoration_v1 * /*zxdg_toplevel_decoration_v1*/,
-    uint32_t mode)
-{
-  static_cast<window_t *>(data)->decoration_mode = zxdg_toplevel_decoration_v1_mode(mode);
-}
-
-static const zxdg_toplevel_decoration_v1_listener toplevel_decoration_v1_listener = {
-    toplevel_decoration_configure,
-};
-
 static void surface_configure(void *data, xdg_surface *xdg_surface, uint32_t serial)
 {
   window_t *win = static_cast<window_t *>(data);
 
-  if (win->xdg_surface != xdg_surface) {
-    return;
-  }
-
-  if (win->pending_width != 0 && win->pending_height != 0) {
-    win->width = win->scale * win->pending_width;
-    win->height = win->scale * win->pending_height;
-    wl_egl_window_resize(win->egl_window, win->width, win->height, 0, 0);
+  int w, h;
+  wl_egl_window_get_attached_size(win->egl_window, &w, &h);
+  if (win->pending_width != 0 && win->pending_height != 0 && win->pending_width != w &&
+      win->pending_height != h) {
+    win->width = win->pending_width;
+    win->height = win->pending_height;
+    wl_egl_window_resize(win->egl_window, win->pending_width, win->pending_height, 0, 0);
     win->pending_width = 0;
     win->pending_height = 0;
     win->w->notify_size();
@@ -144,52 +123,6 @@ static const xdg_surface_listener surface_listener = {
     surface_configure,
 };
 
-static bool update_scale(GHOST_WindowWayland *window)
-{
-  int scale = 0;
-  for (const output_t *output : window->outputs_active()) {
-    if (output->scale > scale)
-      scale = output->scale;
-  }
-
-  if (scale > 0 && window->scale() != scale) {
-    window->scale() = scale;
-    // using the real DPI will cause wrong scaling of the UI
-    // use a multiplier for the default DPI as workaround
-    window->dpi() = scale * base_dpi;
-    wl_surface_set_buffer_scale(window->surface(), scale);
-    return true;
-  }
-  return false;
-}
-
-static void surface_enter(void *data, struct wl_surface * /*wl_surface*/, struct wl_output *output)
-{
-  GHOST_WindowWayland *w = static_cast<GHOST_WindowWayland *>(data);
-  for (const output_t *reg_output : w->outputs()) {
-    if (reg_output->output == output) {
-      w->outputs_active().insert(reg_output);
-    }
-  }
-  update_scale(w);
-}
-
-static void surface_leave(void *data, struct wl_surface * /*wl_surface*/, struct wl_output *output)
-{
-  GHOST_WindowWayland *w = static_cast<GHOST_WindowWayland *>(data);
-  for (const output_t *reg_output : w->outputs()) {
-    if (reg_output->output == output) {
-      w->outputs_active().erase(reg_output);
-    }
-  }
-  update_scale(w);
-}
-
-struct wl_surface_listener wl_surface_listener = {
-    surface_enter,
-    surface_leave,
-};
-
 /** \} */
 
 /* -------------------------------------------------------------------- */
@@ -228,28 +161,17 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
 
   /* Window surfaces. */
   w->surface = wl_compositor_create_surface(m_system->compositor());
-  wl_surface_add_listener(w->surface, &wl_surface_listener, this);
-
   w->egl_window = wl_egl_window_create(w->surface, int(width), int(height));
 
   w->xdg_surface = xdg_wm_base_get_xdg_surface(m_system->shell(), w->surface);
   w->xdg_toplevel = xdg_surface_get_toplevel(w->xdg_surface);
 
-  if (m_system->decoration_manager()) {
-    w->xdg_toplevel_decoration = zxdg_decoration_manager_v1_get_toplevel_decoration(
-        m_system->decoration_manager(), w->xdg_toplevel);
-    zxdg_toplevel_decoration_v1_add_listener(
-        w->xdg_toplevel_decoration, &toplevel_decoration_v1_listener, w);
-    zxdg_toplevel_decoration_v1_set_mode(w->xdg_toplevel_decoration,
-                                         ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
-  }
-
   wl_surface_set_user_data(w->surface, this);
 
   xdg_surface_add_listener(w->xdg_surface, &surface_listener, w);
   xdg_toplevel_add_listener(w->xdg_toplevel, &toplevel_listener, w);
 
-  if (parentWindow && is_dialog) {
+  if (parentWindow) {
     xdg_toplevel_set_parent(
         w->xdg_toplevel, dynamic_cast<const GHOST_WindowWayland *>(parentWindow)->w->xdg_toplevel);
   }
@@ -270,9 +192,6 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
   if (setDrawingContextType(type) == GHOST_kFailure) {
     GHOST_PRINT("Failed to create EGL context" << std::endl);
   }
-
-  /* set swap interval to 0 to prevent blocking */
-  setSwapInterval(0);
 }
 
 GHOST_TSuccess GHOST_WindowWayland::close()
@@ -307,31 +226,6 @@ GHOST_TSuccess GHOST_WindowWayland::notify_size()
       new GHOST_Event(m_system->getMilliSeconds(), GHOST_kEventWindowSize, this));
 }
 
-wl_surface *GHOST_WindowWayland::surface() const
-{
-  return w->surface;
-}
-
-const std::vector<output_t *> &GHOST_WindowWayland::outputs() const
-{
-  return m_system->outputs();
-}
-
-std::unordered_set<const output_t *> &GHOST_WindowWayland::outputs_active()
-{
-  return w->outputs;
-}
-
-uint16_t &GHOST_WindowWayland::dpi()
-{
-  return w->dpi;
-}
-
-int &GHOST_WindowWayland::scale()
-{
-  return w->scale;
-}
-
 GHOST_TSuccess GHOST_WindowWayland::setWindowCursorGrab(GHOST_TGrabCursorMode mode)
 {
   return m_system->setCursorGrab(mode, w->surface);
@@ -416,9 +310,6 @@ GHOST_WindowWayland::~GHOST_WindowWayland()
   releaseNativeHandles();
 
   wl_egl_window_destroy(w->egl_window);
-  if (w->xdg_toplevel_decoration) {
-    zxdg_toplevel_decoration_v1_destroy(w->xdg_toplevel_decoration);
-  }
   xdg_toplevel_destroy(w->xdg_toplevel);
   xdg_surface_destroy(w->xdg_surface);
   wl_surface_destroy(w->surface);
@@ -426,11 +317,6 @@ GHOST_WindowWayland::~GHOST_WindowWayland()
   delete w;
 }
 
-GHOST_TUns16 GHOST_WindowWayland::getDPIHint()
-{
-  return w->dpi;
-}
-
 GHOST_TSuccess GHOST_WindowWayland::setWindowCursorVisibility(bool visible)
 {
   return m_system->setCursorVisibility(visible);

intern/ghost/intern/GHOST_WindowWayland.h

@@ -24,14 +24,9 @@
 
 #include "GHOST_Window.h"
 
-#include <unordered_set>
-#include <vector>
-
 class GHOST_SystemWayland;
 
 struct window_t;
-struct wl_surface;
-struct output_t;
 
 class GHOST_WindowWayland : public GHOST_Window {
  public:
@@ -52,8 +47,6 @@ class GHOST_WindowWayland : public GHOST_Window {
 
   ~GHOST_WindowWayland() override;
 
-  GHOST_TUns16 getDPIHint() override;
-
   GHOST_TSuccess close();
 
   GHOST_TSuccess activate();
@@ -62,16 +55,6 @@ class GHOST_WindowWayland : public GHOST_Window {
 
   GHOST_TSuccess notify_size();
 
-  wl_surface *surface() const;
-
-  const std::vector<output_t *> &outputs() const;
-
-  std::unordered_set<const output_t *> &outputs_active();
-
-  uint16_t &dpi();
-
-  int &scale();
-
  protected:
   GHOST_TSuccess setWindowCursorGrab(GHOST_TGrabCursorMode mode) override;
 

release/scripts/modules/bpy/path.py

@@ -198,7 +198,6 @@ def _clean_utf8(name):
 _display_name_literals = {
     ":": "_colon_",
     "+": "_plus_",
-    "/": "_slash_",
 }
 
 

release/scripts/modules/bpy_types.py

@@ -560,17 +560,9 @@ class Text(bpy_types.ID):
         self.write(string)
 
     def as_module(self):
-        import bpy
-        from os.path import splitext, join
+        from os.path import splitext
         from types import ModuleType
-        name = self.name
-        mod = ModuleType(splitext(name)[0])
-        # This is a fake file-path, set this since some scripts check `__file__`,
-        # error messages may include this as well.
-        # NOTE: the file path may be a blank string if the file hasn't been saved.
-        mod.__dict__.update({
-            "__file__": join(bpy.data.filepath, name),
-        })
+        mod = ModuleType(splitext(self.name)[0])
         # TODO: We could use Text.compiled (C struct member)
         # if this is called often it will be much faster.
         exec(self.as_string(), mod.__dict__)

release/scripts/presets/camera/1_colon_2.3_inch.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 6.16
+bpy.context.camera.sensor_height = 4.62
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1_colon_2.5_inch.py

@@ -1,4 +1,4 @@
 import bpy
 bpy.context.camera.sensor_width = 5.76
 bpy.context.camera.sensor_height = 4.29
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 13.2
-bpy.context.camera.sensor_height = 8.80
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1_slash_1.8_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 7.18
-bpy.context.camera.sensor_height = 5.32
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1_slash_2.3_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 6.17
-bpy.context.camera.sensor_height = 4.55
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/1_slash_2.7_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 5.37
-bpy.context.camera.sensor_height = 4.04
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/2_colon_3_inch.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 9.6
+bpy.context.camera.sensor_height = 5.4
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/2_slash_3_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 8.8
-bpy.context.camera.sensor_height = 6.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/4_colon_3_inch.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 17.31
+bpy.context.camera.sensor_height = 12.98
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/APS-C.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 23.6
-bpy.context.camera.sensor_height = 15.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/APS-C_(Canon).py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 22.30
-bpy.context.camera.sensor_height = 14.90
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Analog_16mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 10.26
-bpy.context.camera.sensor_height = 7.49
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Analog_35mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 22
-bpy.context.camera.sensor_height = 16
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Analog_65mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 52.45
-bpy.context.camera.sensor_height = 23.01
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Analog_IMAX.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 71.41
-bpy.context.camera.sensor_height = 52.63
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Analog_Super_16.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 12.35
-bpy.context.camera.sensor_height = 7.42
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Arri_Alexa.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 23.760
+bpy.context.camera.sensor_height = 13.365
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Arri_Alexa_65.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 54.12
-bpy.context.camera.sensor_height = 25.58
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Arri_Alexa_LF.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 36.70
-bpy.context.camera.sensor_height = 25.54
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Arri_Alexa_Mini_&_SXT.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 29.90
-bpy.context.camera.sensor_height = 15.77
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Cinema_Camera.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 15.81
+bpy.context.camera.sensor_height = 8.88
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Pocket_4K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 18.96
-bpy.context.camera.sensor_height = 10.00
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Pocket_6k.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 23.10
-bpy.context.camera.sensor_height = 12.99
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Pocket_Cinema_Camera.py

@@ -1,4 +1,4 @@
 import bpy
 bpy.context.camera.sensor_width = 12.48
 bpy.context.camera.sensor_height = 7.02
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_Production_Camera_4K.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 21.12
+bpy.context.camera.sensor_height = 11.88
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blackmagic_URSA_4.6K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 25.34
-bpy.context.camera.sensor_height = 14.25
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Blender.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 32
+bpy.context.camera.sensor_height = 18
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/Canon_1100D.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 22.2
+bpy.context.camera.sensor_height = 14.7
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_APS-C.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 22.3
+bpy.context.camera.sensor_height = 14.9
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_APS-H.py

@@ -1,4 +1,4 @@
 import bpy
 bpy.context.camera.sensor_width = 27.90
 bpy.context.camera.sensor_height = 18.60
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Canon_C300.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 24.4
+bpy.context.camera.sensor_height = 13.5
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Foveon_(Sigma).py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 20.70
-bpy.context.camera.sensor_height = 13.80
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Full_Frame_35mm_Camera.py

@@ -1,4 +1,4 @@
 import bpy
 bpy.context.camera.sensor_width = 36
 bpy.context.camera.sensor_height = 24
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Fullframe.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 36
-bpy.context.camera.sensor_height = 24
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/GoPro_Hero3_Black.py

@@ -0,0 +1,6 @@
+import bpy
+bpy.context.camera.sensor_width = 6.16
+bpy.context.camera.sensor_height = 4.62
+bpy.context.camera.lens = 2.77
+
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/GoPro_Hero3_Silver.py

@@ -0,0 +1,6 @@
+import bpy
+bpy.context.camera.sensor_width = 5.371
+bpy.context.camera.sensor_height = 4.035
+bpy.context.camera.lens = 2.77
+
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/GoPro_Hero3_White.py

@@ -1,4 +1,6 @@
 import bpy
 bpy.context.camera.sensor_width = 5.76
 bpy.context.camera.sensor_height = 4.29
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.lens = 2.77
+
+bpy.context.camera.sensor_fit = 'AUTO'

release/scripts/presets/camera/MFT.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 17.3
-bpy.context.camera.sensor_height = 13.0
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Medium-format_(Hasselblad).py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 44
-bpy.context.camera.sensor_height = 33
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Nexus_5.py

@@ -0,0 +1,5 @@
+import bpy
+bpy.context.camera.sensor_width = 4.5
+bpy.context.camera.sensor_height = 3.37
+bpy.context.camera.lens = 3.91
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Nikon_D3100.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 23.1
+bpy.context.camera.sensor_height = 15.4
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Nikon_DX.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 23.6
+bpy.context.camera.sensor_height = 15.8
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Panasonic_AG-HVX200.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 4.68
+bpy.context.camera.sensor_height = 2.633
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Panasonic_LX2.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 8.5
+bpy.context.camera.sensor_height = 4.78
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/RED_Dragon_5K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 25.60
-bpy.context.camera.sensor_height = 13.5
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/RED_Dragon_6K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 30.70
-bpy.context.camera.sensor_height = 15.80
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/RED_Helium_8K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 29.90
-bpy.context.camera.sensor_height = 15.77
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/RED_Monstro_8K.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 40.96
-bpy.context.camera.sensor_height = 21.60
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_Epic.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 30.0
+bpy.context.camera.sensor_height = 15.0
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_2K.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 11.1
+bpy.context.camera.sensor_height = 6.24
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_3K.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 16.65
+bpy.context.camera.sensor_height = 9.36
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Red_One_4K.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 22.2
+bpy.context.camera.sensor_height = 12.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Samsung_Galaxy_S3.py

@@ -0,0 +1,5 @@
+import bpy
+bpy.context.camera.sensor_width = 4.8
+bpy.context.camera.sensor_height = 3.6
+bpy.context.camera.lens = 3.70
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Samsung_Galaxy_S4.py

@@ -0,0 +1,5 @@
+import bpy
+bpy.context.camera.sensor_width = 4.8
+bpy.context.camera.sensor_height = 3.6
+bpy.context.camera.lens = 4.20
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_A55.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 23.4
+bpy.context.camera.sensor_height = 15.6
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_EX1.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 6.97
+bpy.context.camera.sensor_height = 3.92
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Sony_F65.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 24.33
+bpy.context.camera.sensor_height = 12.83
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Super_16_Film.py

@@ -0,0 +1,4 @@
+import bpy
+bpy.context.camera.sensor_width = 12.52
+bpy.context.camera.sensor_height = 7.41
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/Super_35_Film.py

@@ -1,4 +1,4 @@
 import bpy
 bpy.context.camera.sensor_width = 24.89
 bpy.context.camera.sensor_height = 18.66
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_4.py

@@ -1,4 +1,5 @@
 import bpy
 bpy.context.camera.sensor_width = 4.54
 bpy.context.camera.sensor_height = 3.42
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.lens = 3.85
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_4S.py

@@ -1,4 +1,5 @@
 import bpy
 bpy.context.camera.sensor_width = 4.54
 bpy.context.camera.sensor_height = 3.42
-bpy.context.camera.sensor_fit = 'HORIZONTAL'
+bpy.context.camera.lens = 4.28
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/camera/iPhone_5.py

@@ -0,0 +1,5 @@
+import bpy
+bpy.context.camera.sensor_width = 4.54
+bpy.context.camera.sensor_height = 3.42
+bpy.context.camera.lens = 4.10
+bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/keyconfig/keymap_data/blender_default.py

@@ -1079,11 +1079,10 @@ def km_view3d(params):
         ("view3d.view_all", {"type": 'C', "value": 'PRESS', "shift": True},
          {"properties": [("center", True)]}),
         op_menu_pie("VIEW3D_MT_view_pie", {"type": 'D', "value": 'CLICK_DRAG'}),
-        ("view3d.navigate", {"type": 'ACCENT_GRAVE', "value": 'PRESS', "shift": True}, None),
         # Numpad views.
         ("view3d.view_camera", {"type": 'NUMPAD_0', "value": 'PRESS'}, None),
-        ("view3d.view_axis", {"type": 'NUMPAD_1', "value": 'PRESS'},
-         {"properties": [("type", 'FRONT')]}),
+          ("view3d.view_axis", {"type": 'NUMPAD_1', "value": 'PRESS'},
+           {"properties": [("type", 'FRONT')]}),
         ("view3d.view_orbit", {"type": 'NUMPAD_2', "value": 'PRESS', "repeat": True},
          {"properties": [("type", 'ORBITDOWN')]}),
         ("view3d.view_axis", {"type": 'NUMPAD_3', "value": 'PRESS'},
@@ -2544,7 +2543,6 @@ def km_sequencercommon(params):
          {"properties": [("data_path", 'scene.sequence_editor.show_overlay')]}),
         ("wm.context_toggle_enum", {"type": 'TAB', "value": 'PRESS', "ctrl": True},
          {"properties": [("data_path", 'space_data.view_type'), ("value_1", 'SEQUENCER'), ("value_2", 'PREVIEW')]}),
-        ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None),
     ])
 
     if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
@@ -2585,6 +2583,7 @@ def km_sequencer(params):
         ("sequencer.reload", {"type": 'R', "value": 'PRESS', "alt": True}, None),
         ("sequencer.reload", {"type": 'R', "value": 'PRESS', "shift": True, "alt": True},
          {"properties": [("adjust_length", True)]}),
+        ("sequencer.refresh_all", {"type": 'R', "value": 'PRESS', "ctrl": True}, None),
         ("sequencer.offset_clear", {"type": 'O', "value": 'PRESS', "alt": True}, None),
         ("sequencer.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None),
         ("sequencer.delete", {"type": 'X', "value": 'PRESS'}, None),
@@ -2592,7 +2591,7 @@ def km_sequencer(params):
         ("sequencer.copy", {"type": 'C', "value": 'PRESS', "ctrl": True}, None),
         ("sequencer.paste", {"type": 'V', "value": 'PRESS', "ctrl": True}, None),
         ("sequencer.paste", {"type": 'V', "value": 'PRESS', "ctrl": True, "shift": True},
-         {"properties": [("keep_offset", True)]}),
+        {"properties": [("keep_offset", True)]}),
         ("sequencer.images_separate", {"type": 'Y', "value": 'PRESS'}, None),
         ("sequencer.meta_toggle", {"type": 'TAB', "value": 'PRESS'}, None),
         ("sequencer.meta_make", {"type": 'G', "value": 'PRESS', "ctrl": True}, None),

release/scripts/presets/tracking_camera/1__colon__2.3_inch.py

@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 6.16
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0

release/scripts/presets/tracking_camera/1__colon__2.5_inch.py

@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 5.76
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0

release/scripts/presets/tracking_camera/1_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 13.2
-bpy.context.camera.sensor_height = 8.80
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/1_slash_1.8_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 7.18
-bpy.context.camera.sensor_height = 5.32
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/1_slash_2.3_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 6.17
-bpy.context.camera.sensor_height = 4.55
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/1_slash_2.7_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 5.37
-bpy.context.camera.sensor_height = 4.04
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/2__colon__3_inch.py

@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 9.6
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0

release/scripts/presets/tracking_camera/2_slash_3_inch.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 8.8
-bpy.context.camera.sensor_height = 6.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/4__colon__3_inch.py

@@ -0,0 +1,9 @@
+import bpy
+camera = bpy.context.edit_movieclip.tracking.camera
+
+camera.sensor_width = 17.31
+camera.units = 'MILLIMETERS'
+camera.pixel_aspect = 1
+camera.k1 = 0.0
+camera.k2 = 0.0
+camera.k3 = 0.0

release/scripts/presets/tracking_camera/APS-C.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 23.6
-bpy.context.camera.sensor_height = 15.6
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/APS-C_(Canon).py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 22.30
-bpy.context.camera.sensor_height = 14.90
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/APS-H_(Canon).py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 27.90
-bpy.context.camera.sensor_height = 18.60
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/Analog_16mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 10.26
-bpy.context.camera.sensor_height = 7.49
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/Analog_35mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 22
-bpy.context.camera.sensor_height = 16
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/Analog_65mm.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 52.45
-bpy.context.camera.sensor_height = 23.01
-bpy.context.camera.sensor_fit = 'HORIZONTAL'

release/scripts/presets/tracking_camera/Analog_IMAX.py

@@ -1,4 +0,0 @@
-import bpy
-bpy.context.camera.sensor_width = 71.41
-bpy.context.camera.sensor_height = 52.63
-bpy.context.camera.sensor_fit = 'HORIZONTAL'