[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41736] trunk/blender/source: Cycles: fix crash in image assign/remove in image editor.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Nov 10 14:39:26 CET 2011


Revision: 41736
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41736
Author:   blendix
Date:     2011-11-10 13:39:25 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Cycles: fix crash in image assign/remove in image editor.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/ED_image.h
    trunk/blender/source/blender/editors/space_image/image_ops.c
    trunk/blender/source/blender/editors/space_image/space_image.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/source/blender/editors/include/ED_image.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_image.h	2011-11-10 13:38:55 UTC (rev 41735)
+++ trunk/blender/source/blender/editors/include/ED_image.h	2011-11-10 13:39:25 UTC (rev 41736)
@@ -41,7 +41,7 @@
 
 /* space_image.c, exported for transform */
 struct Image *ED_space_image(struct SpaceImage *sima);
-void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
+void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima);
 
 struct ImBuf *ED_space_image_acquire_buffer(struct SpaceImage *sima, void **lock_r);
 void ED_space_image_release_buffer(struct SpaceImage *sima, void *lock);

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c	2011-11-10 13:38:55 UTC (rev 41735)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c	2011-11-10 13:39:25 UTC (rev 41736)
@@ -804,7 +804,7 @@
 		RNA_property_update(C, &pprop->ptr, pprop->prop);
 	}
 	else if(sima) {
-		ED_space_image_set(C, sima, scene, obedit, ima);
+		ED_space_image_set(sima, scene, obedit, ima);
 		iuser= &sima->iuser;
 	}
 	else {
@@ -1420,7 +1420,7 @@
 		RNA_property_update(C, &ptr, prop);
 	}
 	else if(sima)
-		ED_space_image_set(C, sima, scene, obedit, ima);
+		ED_space_image_set(sima, scene, obedit, ima);
 
 	// XXX other users?
 	BKE_image_signal(ima, (sima)? &sima->iuser: NULL, IMA_SIGNAL_USER_NEW_IMAGE);

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2011-11-10 13:38:55 UTC (rev 41735)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2011-11-10 13:39:25 UTC (rev 41736)
@@ -82,9 +82,10 @@
 }
 
 /* called to assign images to UV faces */
-void ED_space_image_set(bContext *C, SpaceImage *sima, Scene *scene, Object *obedit, Image *ima)
+void ED_space_image_set(SpaceImage *sima, Scene *scene, Object *obedit, Image *ima)
 {
-	ED_uvedit_assign_image(CTX_data_main(C), scene, obedit, ima, sima->image);
+	/* context may be NULL, so use global */
+	ED_uvedit_assign_image(G.main, scene, obedit, ima, sima->image);
 	
 	/* change the space ima after because uvedit_face_visible uses the space ima
 	 * to check if the face is displayed in UV-localview */
@@ -99,13 +100,10 @@
 	if(sima->image && sima->image->id.us==0)
 		sima->image->id.us= 1;
 	
-	if(C) {
-		if(obedit)
-			WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);
-		
-		ED_area_tag_redraw(CTX_wm_area(C));
-		
-	}
+	if(obedit)
+		WM_main_add_notifier(NC_GEOM|ND_DATA, obedit->data);
+
+	WM_main_add_notifier(NC_SPACE|ND_SPACE_IMAGE, NULL);
 }
 
 ImBuf *ED_space_image_acquire_buffer(SpaceImage *sima, void **lock_r)

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-10 13:38:55 UTC (rev 41735)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-11-10 13:39:25 UTC (rev 41736)
@@ -514,7 +514,7 @@
 	SpaceImage *sima= (SpaceImage*)(ptr->data);
 	bScreen *sc= (bScreen*)ptr->id.data;
 
-	ED_space_image_set(NULL, sima, sc->scene, sc->scene->obedit, (Image*)value.data);
+	ED_space_image_set(sima, sc->scene, sc->scene->obedit, (Image*)value.data);
 }
 
 static EnumPropertyItem *rna_SpaceImageEditor_draw_channels_itemf(bContext *UNUSED(C), PointerRNA *ptr,

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-11-10 13:38:55 UTC (rev 41735)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2011-11-10 13:39:25 UTC (rev 41736)
@@ -47,6 +47,7 @@
 struct ColorBand;
 struct CurveMapping;
 struct Curve;
+struct DerivedMesh;
 struct EditBone;
 struct EditFace;
 struct EditMesh;
@@ -77,6 +78,7 @@
 struct RenderEngineType;
 struct RenderLayer;
 struct RenderResult;
+struct Scene;
 struct ScrArea;
 struct SculptSession;
 struct ShadeInput;
@@ -198,7 +200,7 @@
 int ED_space_image_show_render(struct SpaceImage *sima){return 0;}
 int ED_space_image_show_paint(struct SpaceImage *sima){return 0;}
 void ED_space_image_paint_update(struct wmWindowManager *wm, struct ToolSettings *settings){}
-void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
+void ED_space_image_set(struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
 struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
 void ED_screen_set_scene(struct bContext *C, struct Scene *scene){}
 void ED_space_clip_set(struct bContext *C, struct SpaceClip *sc, struct MovieClip *clip){}




More information about the Bf-blender-cvs mailing list