[Bf-blender-cvs] [0abaed1dac7] asset-lite-greasepencil: Remove doble init

Antonio Vazquez noreply at git.blender.org
Sat Nov 19 16:30:44 CET 2022


Commit: 0abaed1dac7bb08edae1e894fb3e071f320f38cf
Author: Antonio Vazquez
Date:   Sat Nov 19 16:30:10 2022 +0100
Branches: asset-lite-greasepencil
https://developer.blender.org/rB0abaed1dac7bb08edae1e894fb3e071f320f38cf

Remove doble init

This was introduced by error in the C++ refactor

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

M	source/blender/editors/gpencil/gpencil_asset.cc

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

diff --git a/source/blender/editors/gpencil/gpencil_asset.cc b/source/blender/editors/gpencil/gpencil_asset.cc
index 4716ba47420..9b8d9b268a2 100644
--- a/source/blender/editors/gpencil/gpencil_asset.cc
+++ b/source/blender/editors/gpencil/gpencil_asset.cc
@@ -722,8 +722,6 @@ static tGPDasset *gpencil_session_init_asset_import(bContext *C, wmOperator *op)
 
   tGPDasset *tgpa = MEM_new<tGPDasset>(__func__);
 
-  // MEM_callocN(sizeof(tGPDasset), "GPencil Asset Import Data"));
-
   /* Save current settings. */
   tgpa->bmain = CTX_data_main(C);
   tgpa->depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
@@ -754,8 +752,8 @@ static bool gpencil_asset_import_init(bContext *C, wmOperator *op)
   tGPDasset *tgpa;
 
   /* check context */
-  op->customdata = static_cast<tGPDasset *>(gpencil_session_init_asset_import(C, op));
-  tgpa = static_cast<tGPDasset *>(gpencil_session_init_asset_import(C, op));
+  op->customdata = tgpa = static_cast<tGPDasset *>(gpencil_session_init_asset_import(C, op));
+  op->customdata = tgpa;
   if (tgpa == nullptr) {
     /* something wasn't set correctly in context */
     gpencil_asset_import_exit(C, op);



More information about the Bf-blender-cvs mailing list