[Bf-blender-cvs] [9566e3bc9c6] master: Fix (harmless) mistake in recent new Append code.

Bastien Montagne noreply at git.blender.org
Fri Sep 17 16:21:01 CEST 2021


Commit: 9566e3bc9c6a1c9a3a562738491ab5e7240499ba
Author: Bastien Montagne
Date:   Fri Sep 17 16:19:49 2021 +0200
Branches: master
https://developer.blender.org/rB9566e3bc9c6a1c9a3a562738491ab5e7240499ba

Fix (harmless) mistake in recent new Append code.

This code path is not yet used so no harm, but that was a fairly nasty
potential crash-generator.

===================================================================

M	source/blender/windowmanager/intern/wm_files_link.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index 29e34313be5..d0117d9d57a 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -709,7 +709,7 @@ static void wm_append_do(WMLinkAppendData *lapp_data,
         break;
       case WM_APPEND_ACT_REUSE_LOCAL:
         /* We only need to set `newid` to ID found in previous loop, for proper remapping. */
-        ID_NEW_SET(id->newid, item->customdata);
+        ID_NEW_SET(id, item->customdata);
         /* This is not a 'new' local appended id, do not set `local_appended_new_id` here. */
         break;
       case WM_APPEND_ACT_UNSET:



More information about the Bf-blender-cvs mailing list