Diffusion Krita feccb93adb7e

Merge branch 'master' into rempt/T379-resource-management
feccb93adb7e
Actions

Authored by rempt on Jun 6 2018, 8:30 AM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Jun 6 2018, 8:30 AM

Parents

R37:72b383ca3a44: Make the warning about a missing qmic-qt plugin clearer
R37:33bd845e6c32: Check the database schema version

Branches

Unknown

Tags

Unknown

rempt committed R37:feccb93adb7e: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Jun 6 2018, 8:30 AM

Merged Changes

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

Commit	Author	Details	Committed
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
bea7dc5256a1	dkazakov	Fix misprint	Jun 4 2018
fb43d4e5be61	dkazakov	Fix openGL mipmaps syncing problem on OSX	Jun 4 2018
d7e0a6118945	dkazakov	Fix misprint	Jun 4 2018
bb33a232b08e	dkazakov	Automatically start cache regeneration when the user changes Krita settings	Jun 4 2018
1a4eae554ad6	rempt	Remove unused shadow parameter from KoCanvasController	Jun 4 2018
e468079e0bf1	dkazakov	Disable requesting frame cache regeneration when scrubbing the timeline	Jun 4 2018
df6b22792f24	rempt	Comment out some noisy qDebug	Jun 3 2018
18b51ef290d0	rempt	Remove the special buttons from KoZoomWidgets	Jun 3 2018
5e7ac9bcefd2	rempt	Get rid of two unused KoZoomMode methods	Jun 3 2018
a45929c48a73	rempt	Remove KoZoomMode::ZOOM_TEXT	Jun 3 2018
80b23e0fe05a	rempt	Fix warning	Jun 3 2018
50c01b14f88a	rempt	Get rid of KoCanvasController::zoomMode	Jun 3 2018
ab48251b0964	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 3 2018
b395b05ef54d	vanyossi	FIX: Float precision bug masking issues for vectorized GaussMask generator	Jun 2 2018
0e0e4f9a5a85	scottpetrovic	make multibrush angle use a decimal instead of just integers	Jun 2 2018
758e568fd66a	dkazakov	Fix safe assert when loading an image with Reference Images layer	Jun 1 2018
4e8a29ee0e75	rempt	Update link to getting started page	Jun 1 2018
5d17bdadc0bb	dkazakov	Fix regeneration of frames when ROI is disabled	Jun 1 2018
5bc9884408f2	jounip	Merge branch 'jounip/cross_curves'	Jun 1 2018
a705628c5f60	jounip	Add cross-channel adjustment filter	Jun 1 2018
5255a67fc990	jounip	Extend cubic curves for use as relative adjustments	Jun 1 2018
10f84748a8ca	jounip	Refactor KisPerChannelFilter for extensibility	Jun 1 2018
e13e8f4ec2ab	dkazakov	Fix openGL mipmaps syncing problem on OSX	Jun 1 2018
4163ff302589	rempt	Fix two strings	Jun 1 2018
b55ed74ac98b	vanyossi	FIX: Gauss Circular Mask Antialiasing	Jun 1 2018
8d676447f88a	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 1 2018
b8e2f5c337db	scottpetrovic	Move kwindowsystem to last for deps building since it needs gettext binaries to…	May 31 2018
6180b407073a	alvinhochun	Remove ffmpeg from Windows build script	May 31 2018
367dde182a69	mzhou	Merge branch 'master' of https://anongit.kde.org/krita	May 31 2018
e8078f0613a1	rempt	Clarify	May 31 2018

Changes (168)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			3rdparty/README.md
	M			CMakeLists.txt
	M			build-tools/windows/build.cmd
	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/image/kis_antialiasing_fade_maker.h
	M			libs/image/kis_brush_mask_applicator_factories.cpp
	M			libs/image/kis_cubic_curve.cpp
	M			libs/image/kis_cubic_curve.h
	M			libs/image/kis_gauss_circle_mask_generator_p.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/tests/kis_cubic_curve_test.cpp
	M			libs/libkis/Palette.cpp
	M			libs/libkis/Palette.h
	M			libs/libqml/plugins/kritasketchplugin/models/PaletteColorsModel.cpp
	M			libs/pigment/CMakeLists.txt
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	P			libs/pigment/resources/KoColorSetEntry.cpp Copied from plugins/color/colorspaceextensions/kis_hsv_adjustment.h
	A			libs/pigment/resources/KoColorSetEntry.h
	M			libs/ui/CMakeLists.txt
	P			libs/ui/KisAbstractFrameCacheSwapper.cpp Copied from libs/widgets/tests/zoomcontroller_test.cpp
	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/KisPaletteModel.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_internal_color_selector.cpp
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.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_palette_view.cpp
	M			libs/ui/kis_splash_screen.cpp
	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
	P			libs/ui/tests/KisFrameCacheStoreTest.h Copied from libs/widgets/tests/zoomcontroller_test.cpp
	A			libs/ui/tests/KisFrameSerializerTest.cpp
	P			libs/ui/tests/KisFrameSerializerTest.h Copied from libs/widgets/tests/zoomcontroller_test.cpp
	M			libs/ui/utils/kis_document_aware_spin_box_unit_manager.cpp
	M			libs/ui/widgets/kis_curve_widget.cpp
	M			libs/ui/widgets/kis_curve_widget.h
	M			libs/ui/widgets/kis_curve_widget_p.h
	M			libs/widgets/KoColorSetWidget.cpp
	M			libs/widgets/KoEditColorSetDialog.cpp
	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
	P			libs/widgets/tests/zoomcontroller_test.cpp Copied to multiple locations: libs/ui/KisAbstractFrameCacheSwapper.cpp libs/ui/tests/KisFrameCacheStoreTest.h libs/ui/tests/KisFrameSerializerTest.h
	M			libs/widgets/tests/zoomhandler_test.cpp
	M			packaging/linux/appimage/build-krita.sh
	M			plugins/color/colorspaceextensions/extensions_plugin.cc
	M			plugins/color/colorspaceextensions/kis_hsv_adjustment.cpp
	P			plugins/color/colorspaceextensions/kis_hsv_adjustment.h Copied to libs/pigment/resources/KoColorSetEntry.cpp
	M			plugins/dockers/animation/animation_docker.cpp
	M			plugins/dockers/animation/timeline_docker.cpp
	M			plugins/dockers/animation/timeline_docker.h
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/extensions/pykrita/sip/krita/KisCubicCurve.sip
	M			plugins/extensions/pykrita/sip/krita/Palette.sip
	M			plugins/extensions/qmic/QMic.cpp
	M			plugins/filters/colorsfilters/CMakeLists.txt
	M			plugins/filters/colorsfilters/colorsfilters.cpp
	A			plugins/filters/colorsfilters/kis_cross_channel_filter.cpp
	A			plugins/filters/colorsfilters/kis_cross_channel_filter.h
	P			plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp Copied from plugins/filters/colorsfilters/kis_perchannel_filter.cpp
	P			plugins/filters/colorsfilters/kis_multichannel_filter_base.h Copied from plugins/filters/colorsfilters/kis_perchannel_filter.h
	P			plugins/filters/colorsfilters/kis_perchannel_filter.cpp Copied to plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
	P			plugins/filters/colorsfilters/kis_perchannel_filter.h Copied to plugins/filters/colorsfilters/kis_multichannel_filter_base.h
	M			plugins/filters/colorsfilters/virtual_channel_info.cpp
	M			plugins/filters/colorsfilters/virtual_channel_info.h
	M			plugins/filters/colorsfilters/wdg_perchannel.ui
	M			plugins/filters/threshold/threshold.cpp
	M			plugins/impex/exr/exr_import.cc
	M			plugins/impex/heif/HeifError.cpp
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_loader.h
	M			plugins/paintops/libpaintop/kis_airbrush_option_widget.cpp
	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/palette_docker/palette_sortColors.py
	M			plugins/tools/basictools/kis_tool_colorpicker.cc
	M			plugins/tools/basictools/kis_tool_multihand.cpp
	M			plugins/tools/basictools/kis_tool_multihand.h
	M			plugins/tools/basictools/wdgmultihandtool.ui
	M			plugins/tools/defaulttool/referenceimagestool/ToolReferenceImages.cpp
	M			plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.cpp
	M			plugins/tools/tool_transform2/kis_tool_transform.cc
	M			sdk/tests/testutil.h