Diffusion Krita 91936f7f51b5

Merge branch 'master' into rempt/resourcemodel_rewrite
91936f7f51b5
Actions

Authored by rempt on Jun 15 2020, 9:39 AM.

Description

Merge branch 'master' into rempt/resourcemodel_rewrite

Details

Committed

rempt

Jun 15 2020, 9:39 AM

Parents

R37:518dc1c76eef: Fix logic for adding a new resource version
R37:b73fdfa14b9d: Lens blur: Map between translated and untranslated strings in filter config

Branches

Unknown

Tags

Unknown

References

refs/keep-around/91936f7f51b568356b7f22086abe7193453cc1c9

rempt committed R37:91936f7f51b5: Merge branch 'master' into rempt/resourcemodel_rewrite (authored by rempt).Jun 15 2020, 9:39 AM

Merged Changes

Commit	Author	Details	Committed
b73fdfa14b9d	rempt	Lens blur: Map between translated and untranslated strings in filter config	Jun 15 2020
6dc22af66665	woltherav	Use qt::window instead of qt::tool for keyboard events in the popups.	Jun 14 2020
d10c71ed82a7	woltherav	Make store softproof toggle actually affect storing the softproofing.	Jun 14 2020
28a9a39f2d23	rempt	Remove duplicated kis_slider_spin_box.h header	Jun 14 2020
90b5b66bf199	dkazakov	Make Smart Patch Tool consider active selection	Jun 13 2020
0c68de311da5	dkazakov	Fix applying invert filter on transparency masks	Jun 13 2020
907058637fda	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 13 2020
733a9480fbdc	dkazakov	Fix KoColorSpace::differenceA() handle fully transparent pixels properly	Jun 12 2020
4cb60201bab3	dkazakov	Fix jumping of shapes when Orthogonal Snap is enabled	Jun 11 2020
988bd201893e	dkazakov	Fix "Stroke Selection" when any selection tool is activated	Jun 11 2020
c6fed882eaef	dkazakov	Fix Liquify Transform to avoid changing the image when no transform done	Jun 11 2020
84452a8f7387	dkazakov	Fix updates of masks when changing visibility	Jun 11 2020
44e2bf444b81	dkazakov	Fix loading ASL gradients with only one stop	Jun 11 2020
5c23c1053487	rempt	Make kimageformats depend on karchive so it gets built	Jun 11 2020
6b5eb6040ab9	rempt	Fix some more action files	Jun 11 2020

Changes (48)

				Path	Packages
	M			3rdparty/ext_frameworks/CMakeLists.txt
	M			krita/krita.action
	M			libs/flake/KoSnapProxy.cpp
	M			libs/image/KisProofingConfiguration.cpp
	M			libs/image/KisProofingConfiguration.h
	M			libs/image/floodfill/kis_scanline_fill.cpp
	M			libs/image/kis_asl_layer_style_serializer.cpp
	M			libs/image/kis_liquify_transform_worker.cpp
	M			libs/image/kis_liquify_transform_worker.h
	M			libs/image/kis_mask_projection_plane.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/psd/asl/kis_asl_xml_parser.cpp
	M			libs/psd/asl/kis_asl_xml_writer.cpp
	M			libs/ui/dialogs/kis_dlg_image_properties.cc
	M			libs/ui/forms/wdgGamutMaskToolbar.ui
	M			libs/ui/forms/wdgdisplaysettings.ui
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/forms/wdggeometryoptions.ui
	M			libs/ui/forms/wdgimageproperties.ui
	M			libs/ui/forms/wdgmultipliersdoublesliderspinbox.ui
	M			libs/ui/forms/wdgnewimage.ui
	M			libs/ui/forms/wdgperformancesettings.ui
	M			libs/ui/forms/wdgpreseticonlibrary.ui
	M			libs/ui/kis_derived_resources.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
	D			libs/ui/widgets/kis_slider_spin_box.h
	P			plugins/assistants/Assistants/KisAssistantTool.action Copied from plugins/tools/basictools/KisToolPencil.action
	M			plugins/color/lcms2engine/LcmsColorSpace.h
	M			plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/dockers/lut/black_white_point_chooser.cpp
	M			plugins/filters/blur/kis_lens_blur_filter.cpp
	M			plugins/filters/blur/kis_wdg_lens_blur.cpp
	M			plugins/filters/blur/kis_wdg_lens_blur.h
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_saver.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/tools/basictools/kis_tool_fill.cc
	M			plugins/tools/basictools/kis_tool_gradient.cc
	M			plugins/tools/tool_polygon/KisToolPolygon.action
	M			plugins/tools/tool_smart_patch/kis_inpaint.cpp
	M			plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
	M			plugins/tools/tool_transform2/KisToolTransform.action
	M			plugins/tools/tool_transform2/tool_transform_args.cc