1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 6f23b0fd281..bf6e13e587c 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -207,16 +207,23 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s
 			if (win == NULL) {
 				continue;
 			}
-			Object *obedit = OBEDIT_FROM_WINDOW(win);
+
+			Object *obedit = NULL;
+			{
+				WorkSpace *workspace = WM_window_get_active_workspace(win);
+				ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene);
+				obedit = OBEDIT_FROM_VIEW_LAYER(view_layer);
+			}
+
 			ScrArea *sa;
 			for (sa = sc->areabase.first; sa; sa = sa->next) {
 				SpaceLink *sl;
 				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_IMAGE) {
 						SpaceImage *sima = (SpaceImage *)sl;
-						
-						if (!sima->pin)
+						if (!sima->pin) {
 							ED_space_image_set(sima, scene, obedit, image);
+						}
 					}
 				}
 			}