Diffusion Krita dc7ac96dab7a

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim
dc7ac96dab7a
Actions

Authored by vanyossi on Jun 20 2018, 10:05 PM.

Description

Merge branch 'master' into ivany/T8580-Brush-AVX-Optim

Details

Committed

vanyossi

Jun 20 2018, 10:05 PM

Parents

R37:e36538da1a45: Optimize Rectangular Gauss Mask
R37:026e857c0c68: Fix assert when trying to merge down a group with a transform mask

Branches

Unknown

Tags

Unknown

vanyossi committed R37:dc7ac96dab7a: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jun 20 2018, 10:05 PM

Merged Changes

Commit	Author	Details	Committed
026e857c0c68	dkazakov	Fix assert when trying to merge down a group with a transform mask	Jun 20 2018
36ca3dd981e8	rempt	Fix issues when starting the krita appimage	Jun 20 2018
62cc355e95b7	rempt	Get the APPDIR from the environment to determine whether we're an appimage	Jun 20 2018
60d3885ad66d	rempt	There are no krita/brush plugins, so don't try to load them	Jun 20 2018
bec019d1fd4e	rempt	Improve the message in the multilayer check	Jun 20 2018
9da349553967	dkazakov	Make a correct copy of a projection device when cloning a layer	Jun 20 2018
2b86a7701923	rempt	Partial fix for thumbnails getting the wrong ratio	Jun 20 2018
e6568f4a9a8c	rempt	Cleanup the python path setting	Jun 20 2018
410255d029cf	rempt	Try to make Krita run as an appimage again	Jun 20 2018
7ae56a592988	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 20 2018
90e6bb44e379	rempt	Fix setting the python environment	Jun 19 2018
911faf391aac	rempt	master will become 4.2.0	Jun 19 2018
bfe6d43d4282	rempt	Add some debug for finding the Python library	Jun 19 2018
ce787b08be76	jounip	Fix reference image layer lifetime	Jun 19 2018
b3236b12ebc4	rempt	Fix saving again	Jun 19 2018
310d1a3c049f	pino	Use QDialogButtonBox	Jun 19 2018
aa1699384555	dkazakov	Possibly fix the crash when dropping low quality frames from animation cache	Jun 18 2018
f12b3096fe93	rempt	Rename KisImportExporterManager::mimeFilter to supportedMimeTypes	Jun 18 2018
31d8cf908221	dkazakov	Fix rendering of Stroke layer style with 1px width	Jun 18 2018
2afa3acf56f7	rempt	Remove the tabbed option for the tool options docker	Jun 18 2018
da3cca7e4262	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 18 2018
8e0361a8b224	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jun 17 2018
1c385941d91d	scottpetrovic	fix normal saving for KRA files	Jun 16 2018
ea1dd67bf269	rempt	Layer styles: Hide the preview checkbox	Jun 16 2018
a67f34ef4c0f	rempt	Fix build	Jun 16 2018
fb8f26c9d7d9	rempt	Be far less verbose	Jun 16 2018
f4d8fe232699	rempt	Do not add a layout to a widget that has one already	Jun 16 2018
0e648bcae206	rempt	Change the default shortcuts for raise and lower object	Jun 16 2018
c7aac7fb75eb	rempt	Fix tool priority	Jun 16 2018
a0be8870b6b1	rempt	Fix tool priority	Jun 16 2018
23b2b35e2dc1	rempt	Do not create an export options widget if the current thread is not the gui…	Jun 16 2018
ee9ad6aab57b	pino	i18n fix	Jun 16 2018
dd434d69ce24	rempt	Remove the color slider docker	Jun 16 2018
6211fedad479	pino	i18n fixes	Jun 16 2018
5e2f24a6e4e9	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 16 2018

Changes (104)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			krita/data/actions/InteractionTool.action
	M			krita/main.cc
	M			krita/org.kde.krita.appdata.xml
	M			libs/brush/kis_brush_registry.cpp
	M			libs/flake/tools/KoPathToolFactory.cpp
	M			libs/image/kis_convolution_painter.cc
	M			libs/image/kis_convolution_painter.h
	M			libs/image/kis_filter_mask.cpp
	M			libs/image/kis_gaussian_kernel.cpp
	M			libs/image/kis_gaussian_kernel.h
	M			libs/image/kis_layer.cc
	M			libs/image/layerstyles/kis_ls_bevel_emboss_filter.cpp
	M			libs/image/layerstyles/kis_ls_drop_shadow_filter.cpp
	M			libs/image/layerstyles/kis_ls_satin_filter.cpp
	M			libs/image/layerstyles/kis_ls_stroke_filter.cpp
	M			libs/image/layerstyles/kis_ls_utils.cpp
	M			libs/image/layerstyles/kis_ls_utils.h
	M			libs/impex/MultiLayerCheck.h
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisDecorationsManager.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	M			libs/ui/KisFrameDataSerializer.cpp
	M			libs/ui/KisImportExportManager.cpp
	M			libs/ui/KisImportExportManager.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisReferenceImagesDecoration.cpp
	M			libs/ui/KisReferenceImagesDecoration.h
	M			libs/ui/KisView.cpp
	M			libs/ui/canvas/kis_display_color_converter.cpp
	M			libs/ui/dialogs/kis_dlg_file_layer.cpp
	M			libs/ui/dialogs/kis_dlg_import_image_sequence.cpp
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/flake/KisReferenceImagesLayer.cpp
	M			libs/ui/flake/KisReferenceImagesLayer.h
	M			libs/ui/flake/kis_dummies_facade_base.cpp
	M			libs/ui/input/kis_input_profile_manager.cpp
	M			libs/ui/kis_animation_frame_cache.cpp
	M			libs/ui/kis_image_manager.cc
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/opengl/kis_opengl.cpp
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/widgets/kis_paintop_presets_popup.cpp
	M			libs/ui/widgets/kis_paintop_presets_save.cpp
	M			libs/widgets/KoResourceTaggingManager.cpp
	M			libs/widgets/KoToolDocker.cpp
	M			libs/widgets/KoToolDocker.h
	M			libs/widgetutils/kis_icon_utils.cpp
	M			libs/widgetutils/xmlgui/kcheckaccelerators.cpp
	M			plugins/dockers/CMakeLists.txt
	M			plugins/dockers/animation/timeline_insert_keyframe_dialog.cpp
	D			plugins/dockers/colorslider
	D			plugins/dockers/colorslider/CMakeLists.txt
	D			plugins/dockers/colorslider/kis_color_slider.cpp
	D			plugins/dockers/colorslider/kis_color_slider.h
	D			plugins/dockers/colorslider/kis_color_slider_dock.cpp
	D			plugins/dockers/colorslider/kis_color_slider_dock.h
	D			plugins/dockers/colorslider/kis_color_slider_input.cpp
	D			plugins/dockers/colorslider/kis_color_slider_input.h
	D			plugins/dockers/colorslider/kis_color_slider_widget.cpp
	D			plugins/dockers/colorslider/kis_color_slider_widget.h
	D			plugins/dockers/colorslider/kis_hsv_slider.cpp
	D			plugins/dockers/colorslider/kis_hsv_slider.h
	D			plugins/dockers/colorslider/krita_colorslider.json
	M			plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
	M			plugins/extensions/imagesplit/imagesplit.cpp
	M			plugins/extensions/pykrita/plugin/utilities.cpp
	M			plugins/extensions/resourcemanager/dlg_create_bundle.cpp
	M			plugins/extensions/separate_channels/kis_channel_separator.cc
	M			plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/paintops/spray/kis_spray_shape_option.cpp
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/documenttools/tools/canvassizetool/canvassizetool.py
	M			plugins/python/documenttools/tools/rotatetool/rotatetool.py
	M			plugins/python/documenttools/tools/scaletool/scaletool.py
	M			plugins/python/hello/hello.py
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/lastdocumentsdocker/lastdocumentsdocker.py
	M			plugins/python/palette_docker/palette_docker.py
	M			plugins/python/palette_docker/palette_exporter_gimppalette.py
	M			plugins/python/palette_docker/palette_exporter_inkscapeSVG.py
	M			plugins/python/quick_settings_docker/quick_settings_docker.py
	M			plugins/python/scriptdocker/scriptdocker.py
	M			plugins/python/scripter/ui_scripter/actions/closeaction/closeaction.py
	M			plugins/python/scripter/ui_scripter/actions/debugaction/debugaction.py
	M			plugins/python/scripter/ui_scripter/actions/newaction/newaction.py
	M			plugins/python/scripter/ui_scripter/actions/openaction/openaction.py
	M			plugins/python/scripter/ui_scripter/actions/reloadaction/reloadaction.py
	M			plugins/python/scripter/ui_scripter/actions/runaction/runaction.py
	M			plugins/python/scripter/ui_scripter/actions/saveaction/saveaction.py
	M			plugins/python/scripter/ui_scripter/actions/saveasaction/saveasaction.py
	M			plugins/python/scripter/ui_scripter/actions/settingsaction/settingsaction.py
	M			plugins/python/scripter/ui_scripter/actions/settingsaction/settingsdialog.py
	M			plugins/python/scripter/ui_scripter/tabwidgets/debuggerwidget/stepaction.py
	M			plugins/python/scripter/ui_scripter/tabwidgets/debuggerwidget/stopaction.py
	M			plugins/python/scripter/ui_scripter/tabwidgets/outputwidget/clearaction.py
	M			plugins/python/scripter/uicontroller.py
	M			plugins/python/selectionsbagdocker/selectionsbagdocker.py
	M			plugins/tools/basictools/kis_tool_colorpicker.cc
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.h