Merge branch 'blender-v4.4-release'

2025-02-25 16:28:57 +01:00
parent f15a16d1c6 8f1d03cd75
commit 45ec90efd5
1 changed files with 4 additions and 6 deletions
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -270,14 +270,12 @@

    switch (m_draggedObjectType) {
      case GHOST_kDragnDropTypeBitmap: {
-        if ([NSImage canInitWithPasteboard:draggingPBoard]) {
-          NSImage *droppedImg = [[[NSImage alloc] initWithPasteboard:draggingPBoard] autorelease];
-          data = droppedImg;  // [draggingPBoard dataForType:NSPasteboardTypeTIFF];
-        }
-        else {
+        if (![NSImage canInitWithPasteboard:draggingPBoard]) {
          return NO;
        }
-
+        /* Caller must [release] the returned data in this case. */
+        NSImage *droppedImg = [[NSImage alloc] initWithPasteboard:draggingPBoard];
+        data = droppedImg;
        break;
      }
      case GHOST_kDragnDropTypeFilenames: