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:
authorAntony Riakiotakis <kalast@gmail.com>2014-09-22 13:01:50 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-09-22 13:01:50 +0400
commitd7ddb941a07b806decc867bf58e3ec84d2ec1d41 (patch)
tree94690e31cc65d19530ed182cce6e3217cdd32316 /source/blender/makesrna/intern/rna_sculpt_paint.c
parent9b28ab26b4d5624f253efff42b9b61b18f29fe5c (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_sculpt_paint.c')
-rw-r--r--source/blender/makesrna/intern/rna_sculpt_paint.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index d48d8589f96..b5b938ca2db 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -324,7 +324,9 @@ static void rna_ImaPaint_canvas_update(Main *bmain, Scene *scene, PointerRNA *UN
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, ima);
+
+ if (!sima->pin)
+ ED_space_image_set(sima, scene, scene->obedit, ima);
}
}
}