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/editors/sculpt_paint | |
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/editors/sculpt_paint')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 3 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index f83dd3d7e82..0e3592f59ee 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -1399,7 +1399,8 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op) 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); } } } diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index ef41cdd90ae..e9d1d5487a0 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4910,7 +4910,8 @@ void paint_proj_mesh_data_ensure(bContext *C, Object *ob, wmOperator *op) if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)sl; - ED_space_image_set(sima, scene, scene->obedit, ma->texpaintslot[0].ima); + if (!sima->pin) + ED_space_image_set(sima, scene, scene->obedit, ma->texpaintslot[0].ima); } } } @@ -4950,7 +4951,8 @@ void paint_proj_mesh_data_ensure(bContext *C, Object *ob, wmOperator *op) if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = (SpaceImage *)sl; - ED_space_image_set(sima, scene, scene->obedit, imapaint->canvas); + if (!sima->pin) + ED_space_image_set(sima, scene, scene->obedit, imapaint->canvas); } } } |