diff options
5 files changed, 15 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 113fee19e2c..81bbc7754a7 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -170,7 +170,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal mat = ob.active_material if mat: - col.label("Clone Slot") + col.label("Source Clone Slot") col.template_list("TEXTURE_UL_texpaintslots", "", mat, "texture_paint_images", mat, "paint_clone_slot", rows=2) @@ -179,9 +179,9 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal mesh = ob.data clone_text = mesh.uv_texture_clone.name if mesh.uv_texture_clone else "" - col.label("Image") + col.label("Source Clone Image") col.template_ID(settings, "clone_image") - col.label("UV Map") + col.label("Source Clone UV Map") col.menu("VIEW3D_MT_tools_projectpaint_clone", text=clone_text, translate=False) else: col.prop(brush, "clone_image", text="Image") 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); } } } 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); } } } 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); } } } |