Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-11-26 19:12:17 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-26 19:12:17 +0400
commit3509dd9d7f25913df2a110a86576910863bcd1b5 (patch)
tree1cf5604406b7ba898d8ddac9ec379a7c06d00bcd /source/blender/editors/uvedit/uvedit_ops.c
parentf9bed10d1f4c837fb7b48d1838ad40d341c4ed26 (diff)
fix for changing images in UV editmode with sync-selection enabled, this was switching all images even those from unselected faces.
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_ops.c')
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 0feaec514d2..47791ce71e7 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -224,7 +224,9 @@ void ED_uvedit_assign_image(Main *bmain, Scene *scene, Object *obedit, Image *im
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data, CD_MTEXPOLY);
- if (uvedit_face_visible_test(scene, previma, efa, tf)) {
+ if (uvedit_face_visible_test(scene, previma, efa, tf) &&
+ (selected == TRUE || uvedit_face_select_test(scene, em, efa)))
+ {
if (ima) {
tf->tpage = ima;