Diffusion Krita 8488bd5e1905

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

Authored by vanyossi on Jun 10 2018, 9:25 PM.

Description

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

Details

Committed

vanyossi

Jun 10 2018, 9:25 PM

Parents

R37:8fa826838aa9: Adjust similarity Tolerance.
R37:48b72603def6: Merge branch 'master' of git://anongit.kde.org/krita

Branches

Unknown

Tags

Unknown

vanyossi committed R37:8488bd5e1905: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jun 10 2018, 9:25 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
48b72603def6	Brendan Bd	Merge branch 'master' of git://anongit.kde.org/krita	Jun 10 2018
347e631531eb	Brendan Bd	Update to fix errors caused by 3de294bc4643	Jun 10 2018
46c685fd99bc	jounip	Fix logic error	Jun 10 2018
cf8fce2d8070	jounip	Do not paint reference images while they are getting deleted	Jun 10 2018
26dbc2fd1d22	jounip	Fix reference image decoration buffer size	Jun 10 2018
8cece353d39d	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 10 2018
2747016a313d	dkazakov	Connect Erode/Dilate algorithms to "Stroke" layer style	Jun 9 2018
b3aa5a8858ad	dkazakov	Implement Erode/Dilate morphology function	Jun 9 2018
b76fe11c85e0	woltherav	Ten Brushes Script: Add preset memory.	Jun 8 2018
aa5542ffe290	rempt	Remove unimplemented test	Jun 8 2018
6138f6f14f8e	rempt	Remove useless abstrace base class KoResourceModelBase	Jun 8 2018
d183945d306b	dkazakov	Fix painting layer styles in Inherit Alpha mode	Jun 8 2018
ab670ba3b15b	dkazakov	Fix BuildUp painting mode for masks and selection-based layers	Jun 7 2018
56b7bbc9d9f8	dkazakov	Optimize Fill Layers to not regenerate stuff when not needed	Jun 7 2018
6e023a11d80a	dkazakov	Fix extent calculation for selection-based layers	Jun 7 2018
8b7bffd85da5	dkazakov	Fix loading fully transparent adjustment and fill layers	Jun 7 2018
5345be7d3d62	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 7 2018
b2ae65a74562	emmetoneill	Fixed Timeline's "Remove Frames/Columns and Pull" Actions.	Jun 6 2018
c2391e4f7072	scottpetrovic	Bump up vanishing point density to 180 degrees	Jun 6 2018
3f17d2f55186	scottpetrovic	Allow painting assistants to have their own color	Jun 6 2018
15efb84238ae	jounip	Fix "primary workspace follows focus" activation when creating window layout	Jun 6 2018
bedc6c9b3c32	jounip	Fix reference images disappearing when saving	Jun 6 2018
8d9ccd8d9253	dkazakov	Ask the user about the resolution he wants to use for loading SVG images	Jun 6 2018
92ef7958bba1	rempt	Fix spello	Jun 6 2018
528b04819011	rempt	Remove obsolete KoGlobal singleton	Jun 6 2018
27f4b434fc04	scottpetrovic	Update UI for reference image tool options	Jun 6 2018
8a777b57fe27	rempt	debug--	Jun 5 2018
f60680d1fb08	dkazakov	Change naming of the "Always use 100% outline scale"	Jun 5 2018
eacd03c03370	dkazakov	FEATURE: Force brush outline to be always painted at 100% size	Jun 5 2018
336c78d51160	dkazakov	Remove now unused code	Jun 5 2018
72b383ca3a44	rempt	Make the warning about a missing qmic-qt plugin clearer	Jun 5 2018
40a1a0c0999a	rempt	Do not allow .kra files as file layers	Jun 5 2018
ef8d6b5aab0d	rempt	Keep the alpha channel when applying the threshold filter	Jun 5 2018
601e2459265f	rempt	Don't use the bundle name as a tag	Jun 5 2018
f71e7498a91f	rempt	Copy bundles to the local bundle folder from args	Jun 5 2018
877cb51d0142	rempt	Remove unnecessary dynamic_cast	Jun 5 2018
73a4d2d17ec3	rempt	Remove obsolete print/exportAsPdf command line options	Jun 5 2018
5d16be8b99e9	rempt	Do not hide the safe asserts	Jun 5 2018
3d71e44e32c3	rempt	Remove unused RELEASE_BUILD option	Jun 5 2018
a8dde226d589	rempt	Add a button to explicitly set the color from the combobox	Jun 5 2018
7222ff60f351	rempt	Restore the last-used color only on startup	Jun 5 2018
6d769df9fec5	rempt	Allow creating a group if the current node is a mask	Jun 5 2018
d58a43e48d61	rempt	Show the correct opacity in the segment gradient editor	Jun 5 2018
226aa9a68ab2	yurchor	Fix minor typo	Jun 5 2018
a7a2e61b0267	dkazakov	Fix compilation on newer version of GCC	Jun 4 2018
da6b03e7b6da	dkazakov	Merge remote-tracking branch 'origin/kazakov/animation-cache-swapping'	Jun 4 2018
fd6c490d41f4	rempt	Remove unused include	Jun 4 2018
37d8dec3b65f	jounip	Set defaults for cross-channel adjustment curves	Jun 4 2018
b94dee6cea0d	rempt	Remove the shortcuts for the text tool and artistic text tool	Jun 4 2018
3f2d2b0e8677	dkazakov	Fix update of the timeline after canvas mode is switched	Jun 4 2018

Changes (220)

				Path	Packages
	M			CMakeLists.txt
	D			krita/data/actions/ArtisticTextTool.action
	M			krita/data/actions/CMakeLists.txt
	D			krita/data/actions/TextTool.action
	M			krita/krita.action
	M			krita/main.cc
	M			krita/org.kde.krita.appdata.xml
	M			libs/flake/KoCanvasController.cpp
	M			libs/flake/KoCanvasController.h
	M			libs/flake/KoCanvasControllerWidget.cpp
	M			libs/flake/KoCanvasControllerWidget.h
	M			libs/flake/KoCanvasControllerWidgetViewport_p.cpp
	M			libs/flake/KoCanvasControllerWidgetViewport_p.h
	M			libs/flake/commands/KoSubpathJoinCommand.cpp
	M			libs/global/kis_global.h
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/generator/kis_generator_layer.cpp
	M			libs/image/generator/kis_generator_layer.h
	M			libs/image/kis_cached_paint_device.h
	M			libs/image/kis_fill_painter.cc
	M			libs/image/kis_fill_painter.h
	M			libs/image/kis_gaussian_kernel.cpp
	M			libs/image/kis_gaussian_kernel.h
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_image_config.h
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_paint_device.h
	M			libs/image/kis_painter_blt_multi_fixed.cpp
	M			libs/image/kis_selection_based_layer.cpp
	M			libs/image/kis_selection_based_layer.h
	M			libs/image/layerstyles/kis_layer_style_filter_environment.cpp
	M			libs/image/layerstyles/kis_layer_style_filter_environment.h
	M			libs/image/layerstyles/kis_layer_style_filter_projection_plane.cpp
	M			libs/image/layerstyles/kis_ls_bevel_emboss_filter.cpp
	M			libs/image/layerstyles/kis_ls_overlay_filter.cpp
	M			libs/image/layerstyles/kis_ls_overlay_filter.h
	M			libs/image/layerstyles/kis_ls_stroke_filter.cpp
	M			libs/image/layerstyles/kis_ls_utils.cpp
	M			libs/image/layerstyles/kis_multiple_projection.cpp
	M			libs/image/layerstyles/kis_multiple_projection.h
	A			libs/image/tests/data/convolution_painter_test/dilate_dilate10.png
	A			libs/image/tests/data/convolution_painter_test/dilate_erode5.png
	A			libs/image/tests/data/convolution_painter_test/dilate_initial.png
	A			libs/image/tests/data/fill_painter/patterns_fill__custom_origin.png
	A			libs/image/tests/data/fill_painter/patterns_fill__null_origin.png
	M			libs/image/tests/kis_convolution_painter_test.cpp
	M			libs/image/tests/kis_convolution_painter_test.h
	M			libs/image/tests/kis_fill_painter_test.cpp
	M			libs/image/tests/kis_fill_painter_test.h
	M			libs/image/tests/kis_layer_styles_test.cpp
	M			libs/ui/CMakeLists.txt
	P			libs/ui/KisAbstractFrameCacheSwapper.cpp Copied from libs/ui/tests/kis_resource_server_provider_test.h
	A			libs/ui/KisAbstractFrameCacheSwapper.h
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisApplicationArguments.cpp
	M			libs/ui/KisApplicationArguments.h
	M			libs/ui/KisAsyncAnimationCacheRenderer.cpp
	M			libs/ui/KisAsyncAnimationCacheRenderer.h
	M			libs/ui/KisAsyncAnimationFramesSavingRenderer.cpp
	M			libs/ui/KisAsyncAnimationFramesSavingRenderer.h
	M			libs/ui/KisAsyncAnimationRendererBase.cpp
	M			libs/ui/KisAsyncAnimationRendererBase.h
	M			libs/ui/KisCloneDocumentStroke.cpp
	M			libs/ui/KisColorsetChooser.cpp
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	A			libs/ui/KisFrameCacheStore.cpp
	A			libs/ui/KisFrameCacheStore.h
	A			libs/ui/KisFrameCacheSwapper.cpp
	A			libs/ui/KisFrameCacheSwapper.h
	A			libs/ui/KisFrameDataSerializer.cpp
	A			libs/ui/KisFrameDataSerializer.h
	A			libs/ui/KisInMemoryFrameCacheSwapper.cpp
	A			libs/ui/KisInMemoryFrameCacheSwapper.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMainWindow.h
	M			libs/ui/KisReferenceImage.cpp
	M			libs/ui/KisReferenceImagesDecoration.cpp
	M			libs/ui/KisResourceBundle.cpp
	M			libs/ui/KisView.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/actions/KisPasteActionFactory.cpp
	M			libs/ui/canvas/kis_abstract_canvas_widget.h
	M			libs/ui/canvas/kis_animation_player.cpp
	M			libs/ui/canvas/kis_animation_player.h
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/canvas/kis_canvas_controller.h
	M			libs/ui/canvas/kis_canvas_widget_base.cpp
	M			libs/ui/canvas/kis_canvas_widget_base.h
	M			libs/ui/canvas/kis_coordinates_converter.cpp
	M			libs/ui/canvas/kis_coordinates_converter.h
	M			libs/ui/canvas/kis_qpainter_canvas.h
	M			libs/ui/canvas/kis_update_info.cpp
	M			libs/ui/canvas/kis_update_info.h
	M			libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.cpp
	M			libs/ui/dialogs/KisAsyncAnimationRenderDialogBase.h
	M			libs/ui/dialogs/kis_dlg_file_layer.cpp
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/flake/KisReferenceImagesLayer.cpp
	M			libs/ui/flake/KisReferenceImagesLayer.h
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/forms/wdgperformancesettings.ui
	M			libs/ui/kis_animation_cache_populator.cpp
	M			libs/ui/kis_animation_frame_cache.cpp
	M			libs/ui/kis_animation_frame_cache.h
	M			libs/ui/kis_autogradient.cc
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_painting_assistant.cc
	M			libs/ui/kis_painting_assistant.h
	M			libs/ui/kis_painting_assistants_decoration.cpp
	M			libs/ui/kis_painting_assistants_decoration.h
	M			libs/ui/kis_zoom_manager.cc
	A			libs/ui/opengl/KisOpenGLUpdateInfoBuilder.cpp
	A			libs/ui/opengl/KisOpenGLUpdateInfoBuilder.h
	M			libs/ui/opengl/kis_opengl_canvas2.cpp
	M			libs/ui/opengl/kis_opengl_canvas2.h
	M			libs/ui/opengl/kis_opengl_image_textures.cpp
	M			libs/ui/opengl/kis_opengl_image_textures.h
	M			libs/ui/opengl/kis_texture_tile.cpp
	M			libs/ui/opengl/kis_texture_tile.h
	M			libs/ui/opengl/kis_texture_tile_info_pool.h
	M			libs/ui/opengl/kis_texture_tile_update_info.h
	M			libs/ui/tests/CMakeLists.txt
	A			libs/ui/tests/KisFrameCacheStoreTest.cpp
	V			libs/ui/tests/{KisFrameCacheStoreTest.h ← kis_resource_server_provider_test.h}
	A			libs/ui/tests/KisFrameSerializerTest.cpp
	V			libs/ui/tests/{KisFrameSerializerTest.h ← kis_resource_server_provider_test.cpp}
	V			libs/ui/tests/{kis_resource_server_provider_test.cpp → KisFrameSerializerTest.h}
	P			libs/ui/tests/kis_resource_server_provider_test.h Deleted after being copied to multiple locations: libs/ui/KisAbstractFrameCacheSwapper.cpp libs/ui/tests/KisFrameCacheStoreTest.h
	M			libs/ui/tool/kis_tool_paint.cc
	M			libs/ui/utils/kis_document_aware_spin_box_unit_manager.cpp
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			libs/widgets/CMakeLists.txt
	M			libs/widgets/KoConfigAuthorPage.cpp
	M			libs/widgets/KoDocumentInfoDlg.cpp
	D			libs/widgets/KoGlobal.cpp
	D			libs/widgets/KoGlobal.h
	M			libs/widgets/KoResourceModel.cpp
	M			libs/widgets/KoResourceModel.h
	D			libs/widgets/KoResourceModelBase.cpp
	D			libs/widgets/KoResourceModelBase.h
	M			libs/widgets/KoZoomAction.cpp
	M			libs/widgets/KoZoomAction.h
	M			libs/widgets/KoZoomController.cpp
	M			libs/widgets/KoZoomController.h
	M			libs/widgets/KoZoomController_p.h
	M			libs/widgets/KoZoomMode.cpp
	M			libs/widgets/KoZoomMode.h
	M			libs/widgets/KoZoomWidget.cpp
	M			libs/widgets/KoZoomWidget.h
	M			libs/widgets/koDocumentInfoAboutWidget.ui
	M			libs/widgets/tests/zoomcontroller_test.cpp
	M			libs/widgets/tests/zoomhandler_test.cpp
	M			packaging/linux/appimage/build-krita.sh
	M			plugins/assistants/Assistants/AssistantsToolOptions.ui
	M			plugins/assistants/Assistants/SplineAssistant.cc
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.h
	M			plugins/dockers/animation/animation_docker.cpp
	M			plugins/dockers/animation/kis_animation_curves_model.cpp
	M			plugins/dockers/animation/kis_animation_utils.cpp
	M			plugins/dockers/animation/kis_animation_utils.h
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.h
	M			plugins/dockers/animation/tests/kis_animation_utils_test.cpp
	M			plugins/dockers/animation/timeline_docker.cpp
	M			plugins/dockers/animation/timeline_docker.h
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/extensions/pykrita/kritarunner/main.cpp
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/filters/colorsfilters/kis_cross_channel_filter.cpp
	M			plugins/filters/colorsfilters/kis_cross_channel_filter.h
	M			plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
	M			plugins/filters/colorsfilters/kis_multichannel_filter_base.h
	M			plugins/filters/threshold/threshold.cpp
	M			plugins/flake/textshape/dialogs/LanguageTab.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_loader.h
	M			plugins/impex/svg/kis_svg_import.cc
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
	M			plugins/paintops/deform/kis_deform_paintop_settings.cpp
	M			plugins/paintops/deform/kis_deform_paintop_settings.h
	M			plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop_settings.h
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings.h
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop_settings.h
	M			plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.h
	M			plugins/paintops/libpaintop/kis_current_outline_fetcher.cpp
	M			plugins/paintops/libpaintop/kis_current_outline_fetcher.h
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings.cpp
	M			plugins/paintops/roundmarker/kis_roundmarkerop_settings.h
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.h
	M			plugins/paintops/spray/kis_spray_paintop_settings.cpp
	M			plugins/paintops/spray/kis_spray_paintop_settings.h
	M			plugins/python/krita_script_starter/krita_script_starter.py
	M			plugins/python/palette_docker/palette_docker.py
	M			plugins/python/tenbrushes/tenbrushes.py
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.h
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImagesWidget.cpp
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImagesWidget.h
	M			plugins/tools/defaulttool/referenceimagestool/WdgToolOptions.ui
	M			plugins/tools/tool_transform2/kis_tool_transform.cc
	M			sdk/tests/testutil.h