diff options
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 11 | ||||
| -rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 9 |
2 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index dc2f764d8fd..30564d52343 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -398,16 +398,7 @@ static void image_refresh(const bContext *C, ScrArea *sa) int selected = !(scene->toolsettings->uv_flag & UV_SYNC_SELECTION); /* only selected active face? */ if (BKE_scene_use_new_shading_nodes(scene)) { - /* new shading system, get image from material */ - BMFace *efa = BM_active_face_get(em->bm, sloppy, selected); - - if (efa) { - Image *node_ima; - ED_object_get_active_image(obedit, efa->mat_nr + 1, &node_ima, NULL, NULL); - - if (node_ima) - sima->image = node_ima; - } + /* new shading system does not alter image */ } else { /* old shading system, we set texface */ diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index ed8714d473c..a891826fbd6 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -167,13 +167,12 @@ void ED_object_assign_active_image(Main *bmain, Object *ob, int mat_nr, Image *i //#define USE_SWITCH_ASPECT -void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *ima, Image *previma) +void ED_uvedit_assign_image(Main *UNUSED(bmain), Scene *scene, Object *obedit, Image *ima, Image *previma) { BMEditMesh *em; BMIter iter; MTexPoly *tf; int update = 0; - int sloppy = TRUE; int selected = !(scene->toolsettings->uv_flag & UV_SYNC_SELECTION); /* skip assigning these procedural images... */ @@ -190,11 +189,7 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im } if (BKE_scene_use_new_shading_nodes(scene)) { - /* new shading system, assign image in material */ - BMFace *efa = BM_active_face_get(em->bm, sloppy, selected); - - if (efa) - ED_object_assign_active_image(bmain, obedit, efa->mat_nr + 1, ima); + /* new shading system, do not assign anything */ } else { BMFace *efa; |