[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49453] trunk/blender: fix crash when polling image sample outside image space.

Campbell Barton ideasman42 at gmail.com
Wed Aug 1 16:29:25 CEST 2012


Revision: 49453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49453
Author:   campbellbarton
Date:     2012-08-01 14:29:24 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
fix crash when polling image sample outside image space.

also remove historic comment which isnt helpful.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn.c
    trunk/blender/source/blender/editors/space_image/image_ops.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-08-01 14:19:42 UTC (rev 49452)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c	2012-08-01 14:29:24 UTC (rev 49453)
@@ -644,7 +644,7 @@
 	MEM_printmemlist_internal(1);
 }
 
-short MEM_freeN(void *vmemh)        /* anders compileertie niet meer */
+short MEM_freeN(void *vmemh)
 {
 	short error = 0;
 	MemTail *memt;

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2012-08-01 14:19:42 UTC (rev 49452)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2012-08-01 14:29:24 UTC (rev 49453)
@@ -203,21 +203,27 @@
 	return 0;
 }
 
-static int space_image_image_sample_poll(bContext *C)
+static int image_sample_poll(bContext *C)
 {
 	SpaceImage *sima = CTX_wm_space_image(C);
-	Object *obedit = CTX_data_edit_object(C);
-	ToolSettings *toolsettings = CTX_data_scene(C)->toolsettings;
+	if (sima) {
+		Scene *scene = CTX_data_scene(C);
+		Object *obedit = CTX_data_edit_object(C);
+		ToolSettings *toolsettings = scene->toolsettings;
 
-	if (obedit) {
-		if (ED_space_image_show_uvedit(sima, obedit) && (toolsettings->use_uv_sculpt))
-			return 0;
+		if (obedit) {
+			if (ED_space_image_show_uvedit(sima, obedit) && (toolsettings->use_uv_sculpt))
+				return FALSE;
+		}
+		else if (sima->mode != SI_MODE_VIEW) {
+			return FALSE;
+		}
+
+		return space_image_main_area_poll(C);
 	}
-	else if (sima->mode != SI_MODE_VIEW) {
-		return 0;
+	else {
+		return FALSE;
 	}
-
-	return space_image_main_area_poll(C);
 }
 /********************** view pan operator *********************/
 
@@ -2113,7 +2119,7 @@
 	ot->invoke = image_sample_invoke;
 	ot->modal = image_sample_modal;
 	ot->cancel = image_sample_cancel;
-	ot->poll = space_image_image_sample_poll;
+	ot->poll = image_sample_poll;
 
 	/* flags */
 	ot->flag = OPTYPE_BLOCKING;




More information about the Bf-blender-cvs mailing list