[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54329] trunk/blender/source/blender/ editors/mesh/mesh_data.c: fix [#34118] Crash, when clicking " Assign image to UV Map"

[Campbell Barton]

Revision: 54329
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54329
Author:   campbellbarton
Date:     2013-02-05 14:33:55 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
fix [#34118] Crash, when clicking "Assign image to UV Map"

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/mesh_data.c

Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c	2013-02-05 14:27:24 UTC (rev 54328)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c	2013-02-05 14:33:55 UTC (rev 54329)
@@ -575,13 +575,19 @@
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
 	View3D *v3d = CTX_wm_view3d(C);
-	Base *base = ED_view3d_give_base_under_cursor(C, event->mval);
+	Base *base;
 	Image *ima = NULL;
 	Mesh *me;
 	Object *obedit;
 	int exitmode = 0;
-	char name[MAX_ID_NAME - 2];
 	
+	if (v3d == NULL) {
+		BKE_report(op->reports, RPT_ERROR, "No 3D View Available");
+		return OPERATOR_CANCELLED;
+	}
+
+	base = ED_view3d_give_base_under_cursor(C, event->mval);
+
 	/* Check context */
 	if (base == NULL || base->object->type != OB_MESH) {
 		BKE_report(op->reports, RPT_ERROR, "Not an object or mesh");
@@ -596,6 +602,7 @@
 		ima = BKE_image_load_exists(path);
 	}
 	else {
+		char name[MAX_ID_NAME - 2];
 		RNA_string_get(op->ptr, "name", name);
 		ima = (Image *)BKE_libblock_find_name(ID_IM, name);
 	}