Commit: 5b67ec9c9f7eb2247e05f4acd2cec62f0eb13fc7
Author: Bastien Montagne
Date: Thu Apr 7 16:35:34 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB5b67ec9c9f7eb2247e05f4acd2cec62f0eb13fc7
Always reset to default asset engine (i.e. regular filebrowser code) when
opening a new browser.
Else we'd have the last used engine even when saving a .blend or picture, ugly!
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c
b/source/blender/windowmanager/intern/wm_event_system.c
index 24d4144..2bcddd2 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -50,6 +50,9 @@
#include "BLI_utildefines.h"
#include "BLI_math.h"
+#include "RNA_access.h"
+
+#include "BKE_asset.h"
#include "BKE_context.h"
#include "BKE_idprop.h"
#include "BKE_global.h"
@@ -66,8 +69,6 @@
#include "ED_view3d.h"
#include "ED_util.h"
-#include "RNA_access.h"
-
#include "GPU_debug.h"
#include "UI_interface.h"
@@ -1811,6 +1812,10 @@ static int wm_handler_fileselect_do(bContext *C,
ListBase *handlers, wmEventHand
sfile = (SpaceFile *)sa->spacedata.first;
sfile->op = handler->op;
+ /* Note: This may not be optimal, but for now always
reset to default engine when opening a new browser.
+ * Otherwise, we get previous engine even when we
want to save .blend, yuck. */
+ BLI_strncpy(sfile->asset_engine, AE_FAKE_ENGINE_ID,
sizeof(sfile->asset_engine));
+
ED_fileselect_set_params(sfile);
action = WM_HANDLER_BREAK;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
