diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-22 13:01:50 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-22 13:01:50 +0400 |
commit | d7ddb941a07b806decc867bf58e3ec84d2ec1d41 (patch) | |
tree | 94690e31cc65d19530ed182cce6e3217cdd32316 /source/blender/makesrna/intern/rna_material.c | |
parent | 9b28ab26b4d5624f253efff42b9b61b18f29fe5c (diff) |
Projective painting:
* Make clone UI a bit more descriptive
* Don't set images to image editors that have a pinned image.
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 1ef39ec4a77..2e4f24fc0ce 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -204,7 +204,9 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)sl; - ED_space_image_set(sima, scene, scene->obedit, image); + + if (!sima->pin) + ED_space_image_set(sima, scene, scene->obedit, image); } } } |