diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-15 22:05:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-15 22:05:53 +0400 |
| commit | ceb61eb14d86132522e38c238bf249dbeb84b237 (patch) | |
| tree | 526daaac259afc84abaac6436620cac104ba43ab /source/blender/editors/space_image/space_image.c | |
| parent | d260ccb92743f8fb500b0c5cd3033a88e8fa35a4 (diff) | |
Fix #34978: for cycles, images displayed in the UV editor where coupled to the
active image texture node in the material, now this is removed and the image in
the image editor is decoupled and not changed upon entering edit mode.
This system caused more confusion then it's worth, changing or removing textures
would modify the material but users would often not be aware of this.
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 11 |
1 files changed, 1 insertions, 10 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 */ |