[Bf-blender-cvs] [4eeffd5] GPencil_Editing_Stage3: GP EditMode: Fix for crash loading files saved with stroke editmode active

[Joshua Leung]

Commit: 4eeffd5ea975171f31f0c2c589e920b90fca72be
Author: Joshua Leung
Date:   Mon Sep 21 01:41:48 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB4eeffd5ea975171f31f0c2c589e920b90fca72be

GP EditMode: Fix for crash loading files saved with stroke editmode active

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

M	source/blender/editors/gpencil/gpencil_edit.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 080de3a..52d1e45 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -102,7 +102,9 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *UNUSED(op))
 	 * we will only do this in the 3D view, where the ob->mode
 	 * gets shown.
 	 */
-	if ((sa->spacetype == SPACE_VIEW3D) && (ob != NULL)) {
+	if (((sa == NULL) || (sa->spacetype == SPACE_VIEW3D)) && 
+	    (ob != NULL)) 
+	{
 		ob->restore_mode = ob->mode;
 		
 		if (gpd->flag & GP_DATA_STROKE_EDITMODE) {