[Bf-blender-cvs] [f45d0910507] asset-browser-poselib: Fix compile error after recent changes in master

Julian Eisel noreply at git.blender.org
Sun Jun 13 22:38:52 CEST 2021


Commit: f45d091050721280e18f9caa5256c84a6059510a
Author: Julian Eisel
Date:   Sun Jun 13 22:32:03 2021 +0200
Branches: asset-browser-poselib
https://developer.blender.org/rBf45d091050721280e18f9caa5256c84a6059510a

Fix compile error after recent changes in master

Master now has to option to choose between linking and appending. For now the
asset view will just append by default for now.

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

M	source/blender/editors/interface/interface_template_asset_view.cc

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

diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc
index 653fc42f370..7f298f0f3f1 100644
--- a/source/blender/editors/interface/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/interface_template_asset_view.cc
@@ -67,6 +67,7 @@ static void asset_view_item_but_drag_set(uiBut *but,
       UI_but_drag_set_asset(but,
                             asset_handle->file_data->name,
                             BLI_strdup(blend_path),
+                            FILE_ASSET_IMPORT_APPEND,
                             asset_handle->file_data->blentype,
                             asset_handle->file_data->preview_icon_id,
                             imbuf,



More information about the Bf-blender-cvs mailing list