3 files changed, 1 insertions, 33 deletions

diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index c719af9e0e2..c598e486a7e 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -63,11 +63,8 @@ Image *ED_space_image(SpaceImage *sima)
 }
 
 /* called to assign images to UV faces */
-void ED_space_image_set(SpaceImage *sima, Scene *scene, Object *obedit, Image *ima)
+void ED_space_image_set(SpaceImage *sima, Scene *UNUSED(scene), Object *obedit, Image *ima)
 {
-	/* 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_test uses the space ima
 	 * to check if the face is displayed in UV-localview */
 	sima->image = ima;
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 9162b8b76a9..a905e61dd88 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -73,7 +73,6 @@
 #include "DEG_depsgraph.h"
 
 #include "GPU_draw.h"
-#include "GPU_buffers.h"
 
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
@@ -2445,7 +2444,6 @@ static int image_new_exec(bContext *C, wmOperator *op)
 		bScreen *sc;
 		Object *ob = CTX_data_active_object(C);
 		
-		GPU_drawobject_free(ob->derivedFinal);	
 		if (scene->toolsettings->imapaint.canvas)
 			id_us_min(&scene->toolsettings->imapaint.canvas->id);
 		scene->toolsettings->imapaint.canvas = ima;
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 54037059cc3..38a850568fd 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -410,7 +410,6 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 {
 	Scene *scene = CTX_data_scene(C);
 	SpaceImage *sima = sa->spacedata.first;
-	Object *obedit = CTX_data_edit_object(C);
 	Image *ima;
 
 	ima = ED_space_image(sima);
@@ -426,32 +425,6 @@ static void image_refresh(const bContext *C, ScrArea *sa)
 			}
 		}
 	}
-	else if (ima && (ima->source == IMA_SRC_VIEWER || sima->pin)) {
-		/* pass */
-	}
-	else if (obedit && obedit->type == OB_MESH) {
-		Mesh *me = (Mesh *)obedit->data;
-		struct BMEditMesh *em = me->edit_btmesh;
-		bool sloppy = true; /* partially selected face is ok */
-		bool selected = !(scene->toolsettings->uv_flag & UV_SYNC_SELECTION); /* only selected active face? */
-
-		if (BKE_scene_use_new_shading_nodes(scene)) {
-			/* new shading system does not alter image */
-		}
-		else {
-			/* old shading system, we set texface */
-			if (em && EDBM_uv_check(em)) {
-				BMFace *efa = BM_mesh_active_face_get(em->bm, sloppy, selected);
-
-				if (efa) {
-					/* don't need to check for pin here, see above */
-					Image *image = BKE_object_material_edit_image_get(obedit, efa->mat_nr);
-
-					sima->image = image;
-				}
-			}
-		}
-	}
 }
 
 static void image_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn, Scene *scene,