[Bf-blender-cvs] [a23995f42a6] blender2.8: Fix/workaround crash when appending workspace in edit mode

Julian Eisel noreply at git.blender.org
Sun May 13 16:54:13 CEST 2018


Commit: a23995f42a662533f24764f9051a70b224aa77d7
Author: Julian Eisel
Date:   Sun May 13 16:49:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa23995f42a662533f24764f9051a70b224aa77d7

Fix/workaround crash when appending workspace in edit mode

Linking/appending in edit mode currently isn't supported. For workspaces it
should probably be, but we can look into supporting this later.

For now gray out buttons in "Add Workspace" menu while in edit mode.

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

M	source/blender/editors/screen/workspace_edit.c

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

diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index c8aa4560dc4..bd4381f4099 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -331,6 +331,12 @@ static void WORKSPACE_OT_workspace_delete(wmOperatorType *ot)
 	ot->exec = workspace_delete_exec;
 }
 
+static int workspace_append_activate_poll(bContext *C)
+{
+	wmOperatorType *ot = WM_operatortype_find("WM_OT_append", false);
+	return WM_operator_poll(C, ot);
+}
+
 static int workspace_append(bContext *C, const char *directory, const char *idname)
 {
 	wmOperatorType *ot = WM_operatortype_find("WM_OT_append", false);
@@ -384,6 +390,7 @@ static void WORKSPACE_OT_append_activate(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->exec = workspace_append_activate_exec;
+	ot->poll = workspace_append_activate_poll;
 
 	RNA_def_string(ot->srna, "idname", NULL, MAX_ID_NAME - 2, "Identifier",
 	               "Name of the workspace to append and activate");



More information about the Bf-blender-cvs mailing list