shift-gesture-slowdown
77fc478669be
Actions

Authored by dkazakov on Sep 15 2016, 8:14 AM.

Description

Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown

Just merge and resonve the conflicts. It doesn't compile.

Conflicts:
libs/image/brushengine/kis_paintop_settings.cpp
libs/image/brushengine/kis_paintop_settings.h
plugins/paintops/deform/kis_deform_paintop_settings.h
plugins/paintops/deform/kis_deform_paintop_settings_widget.cpp
plugins/paintops/deform/kis_deform_paintop_settings_widget.h
plugins/paintops/gridbrush/kis_grid_paintop.cpp
plugins/paintops/gridbrush/kis_grid_paintop.h
plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
plugins/paintops/gridbrush/kis_grid_paintop_settings.h
plugins/paintops/gridbrush/kis_gridop_option.h
plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
plugins/paintops/spray/kis_spray_paintop_settings.h
plugins/paintops/spray/kis_spray_paintop_settings_widget.h

Details

Committed

dkazakov

Sep 15 2016, 8:14 AM

Parents

R37:6c9f819ea3bc: Fix build...
R37:fce36897da34: Fix CamelCase filenames

Branches

Unknown

Tags

Unknown

dkazakov committed R37:77fc478669be: Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown (authored by dkazakov).Sep 15 2016, 8:14 AM

Merged Changes

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

Commit		Author	Details	Committed
6c9f819ea3bc		rempt	Fix build...	Sep 15 2016
ce14644e51da		rempt	debug--	Sep 15 2016
694980520177		rempt	Skip malformed credit entries in the abouttbox	Sep 15 2016
adbd8f99d0ee		dkazakov	Fix OCIO display filter test	Sep 14 2016
b7b66342db17		rempt	Hack: only look for templates in folders that contain the word "templates"	Sep 14 2016
0e6db278ae14		rempt	BUG:368764 Manage the display filters with shared pointers	Sep 14 2016
529f24faf18b		pino	fixuifiles	Sep 14 2016
461e57772810		yurchor	Fix minor typo	Sep 13 2016
e0d9a4feba0d		rempt	Ask for 3.0 on platforms other than osx	Sep 13 2016
73fe154c55c3		Nim	Added legacy cursor shaders to resource file	Sep 13 2016
d555b47fa32e		rempt	Fix painting with the hatching brush	Sep 13 2016
8a14d6338615		dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/round-marker	Sep 13 2016
bf2a65647c81		dkazakov	Merge remote-tracking branch 'origin/master' into kazakov/round-marker	Sep 13 2016
0280aa780497	D2755	Nim	Patch Qt on OSX for fixing the opengl qpainter engine	Sep 13 2016
f957071546c8		rempt	BUG:368747 Fix regression in the hatching paintop	Sep 13 2016
17bded7d752a	D2755	Nim	Merge branch 'nimmy/opengl-patch' of git://anongit.kde.org/krita into…	Sep 13 2016
5bcd9f18ad46		rempt	Fix regression in the sketch brush	Sep 13 2016
5f917be3bd92		rempt	BUG:368727 Don't crash on using the scratchpad	Sep 13 2016
a5a46bf2069d		rempt	Sort the assistants combobox	Sep 13 2016
7e7c4b55e41a		rempt	Warning--	Sep 13 2016
867946cca46f		rempt	warning--	Sep 13 2016
42048713623e		rempt	warning--	Sep 13 2016
90f8f78471ca		rempt	Warning--	Sep 13 2016
80a749721868		rempt	warning--	Sep 13 2016
28e5ee783d54		rempt	Disable the compositions benchmark, it doesn't build	Sep 13 2016
1f506bfbc20e		rempt	Only set the core profile on OSX	Sep 13 2016
9566bb024122		rempt	Fix memory leak	Sep 13 2016
76ce82409e74		rempt	Explicitly initialize variables	Sep 13 2016
210f3b8a7a44		rempt	BUG:368614 Fix a memory leak and a recursive sig/slot connection	Sep 13 2016
bf568080f30d		rempt	Fix whitespace	Sep 13 2016
718fc48864e2		rempt	Fix memory leak: explicitly set a parent	Sep 13 2016
398b57e612f2		rempt	Remove unused variable and clean up after delete	Sep 13 2016
dd907a1ebfdc		rempt	Fix crash when used from the filter brush	Sep 13 2016
142cd8dc8aef		rempt	Remove this test.	Sep 13 2016
2b5cec222a3e		rempt	Fix double delete	Sep 13 2016
5d95667f368b		dkazakov	Use the icon by Timothee Giet for Quick brush	Sep 13 2016
01d5ad5f3c7d		dkazakov	Rename "Round Marker" brush into "Quick Brush"	Sep 13 2016
f273d1162733		rempt	Fix test	Sep 13 2016
fbd916d2af9c		rempt	Fix memory leak	Sep 13 2016
711e21e9d2fc		rempt	Properly initialize all d-pointer variables	Sep 13 2016
32577f4f0199		woltherav	Merge branch 'krita-testing-wolthera': Halftone filter added!	Sep 12 2016
7bfed2622a5d		woltherav	Disable adjustment layers.	Sep 12 2016
71dd8b8ceef1		woltherav	Update halftone filter config stuff to match new shared pointers	Sep 12 2016
fe3821a9f1ce	D2755	Nim	Patch Qt on OSX for fixing the opengl qpainter engine	Sep 12 2016
4db1ec68f43f		Nim	Added legacy cursor shaders	Sep 12 2016
03c41962a1f9		Nim	Added exception handling to loading display shader	Sep 12 2016
69a86be62905		Nim	Merge branch 'master' into nimmy/opengl-patch	Sep 12 2016
3ae0e115ee49		woltherav	Merge branch 'master' into krita-testing-wolthera	Sep 12 2016
0edbc8b8508a		langkamp	Merge branch 'langkamp/stopgradienteditor'	Sep 12 2016
d526e8f74a63		Nim	Added documentation for KisOpenGLCanvas2	Sep 12 2016

Changes (991)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/ext_qt/CMakeLists.txt
A		3rdparty/ext_qt/gerrit-166202.diff
M		3rdparty/ext_qt/macdeploy-qt.diff
M		CMakeLists.txt
M		benchmarks/CMakeLists.txt
M		benchmarks/kis_bcontrast_benchmark.cpp
M		benchmarks/kis_blur_benchmark.cpp
M		benchmarks/kis_filter_selections_benchmark.h
M		benchmarks/kis_level_filter_benchmark.cpp
M		interfaces/KoID.h
M		krita/data/shaders/bilinear_gradient.frag
M		krita/data/shaders/conical_gradient.frag
M		krita/data/shaders/conical_symetric_gradient.frag
P		krita/data/shaders/cursor.frag Copied to krita/data/shaders/cursor_legacy.frag
P		krita/data/shaders/cursor.vert Copied to krita/data/shaders/cursor_legacy.vert
P		krita/data/shaders/cursor_legacy.frag Copied from krita/data/shaders/cursor.frag
P		krita/data/shaders/cursor_legacy.vert Copied from krita/data/shaders/cursor.vert
M		krita/data/shaders/highq_downscale.frag
M		krita/data/shaders/linear_gradient.frag
M		krita/data/shaders/matrix_transform.vert
M		krita/data/shaders/matrix_transform_legacy.vert
M		krita/data/shaders/radial_gradient.frag
M		krita/data/shaders/shaders.qrc
M		krita/data/shaders/simple_texture.frag
M		krita/data/shaders/simple_texture_legacy.frag
M		krita/data/shaders/square_gradient.frag
M		krita/krita.action
M		krita/krita.xmlgui
M		krita/kritamenu.action
M		krita/main.cc
A		krita/pics/layers/dark_colorizeMask.svg
M		krita/pics/layers/layers-icons.qrc
A		krita/pics/layers/light_colorizeMask.svg
A		krita/pics/svg/dark_showColoring.svg
A		krita/pics/svg/dark_showColoringOff.svg
A		krita/pics/svg/dark_showMarks.svg
A		krita/pics/svg/dark_showMarksOff.svg
A		krita/pics/svg/dark_updateColorize.svg
A		krita/pics/svg/light_showColoring.svg
A		krita/pics/svg/light_showColoringOff.svg
A		krita/pics/svg/light_showMarks.svg
A		krita/pics/svg/light_showMarksOff.svg
A		krita/pics/svg/light_updateColorize.svg
M		krita/pics/svg/svg-icons.qrc
A		krita/pics/tools/SVG/16/dark_krita_tool_lazybrush.svg
A		krita/pics/tools/SVG/16/light_krita_tool_lazybrush.svg
M		krita/pics/tools/SVG/16/tools-svg-16-icons.qrc
M		libs/brush/kis_imagepipe_brush.h
M		libs/flake/KoPatternBackground.cpp
M		libs/flake/KoShapeRegistry.h
M		libs/global/kis_dom_utils.h
M		libs/image/CMakeLists.txt
M		libs/image/brushengine/kis_combo_based_paintop_property.cpp
M		libs/image/brushengine/kis_combo_based_paintop_property.h
M		libs/image/brushengine/kis_locked_properties.cc
M		libs/image/brushengine/kis_locked_properties.h
M		libs/image/brushengine/kis_locked_properties_proxy.cpp
M		libs/image/brushengine/kis_locked_properties_proxy.h
M		libs/image/brushengine/kis_locked_properties_server.cpp
M		libs/image/brushengine/kis_locked_properties_server.h
M		libs/image/brushengine/kis_paintop.cc
M		libs/image/brushengine/kis_paintop_config_widget.cpp
M		libs/image/brushengine/kis_paintop_config_widget.h
M		libs/image/brushengine/kis_paintop_settings.cpp
M		libs/image/brushengine/kis_paintop_settings.h
M		libs/image/brushengine/kis_paintop_utils.h
P		libs/image/brushengine/kis_slider_based_paintop_property.cpp Copied from plugins/impex/video/tests/kis_video_plugin_test.h
M		libs/image/brushengine/kis_slider_based_paintop_property.h
M		libs/image/brushengine/kis_uniform_paintop_property.cpp
M		libs/image/brushengine/kis_uniform_paintop_property.h
M		libs/image/commands/kis_change_filter_command.h
M		libs/image/commands_new/kis_image_set_resolution_command.cpp
M		libs/image/filter/kis_color_transformation_configuration.cc
M		libs/image/filter/kis_color_transformation_configuration.h
M		libs/image/filter/kis_color_transformation_filter.cc
M		libs/image/filter/kis_color_transformation_filter.h
M		libs/image/filter/kis_filter.cc
M		libs/image/filter/kis_filter.h
M		libs/image/filter/kis_filter_configuration.h
M		libs/image/filter/kis_filter_registry.cc
M		libs/image/filter/kis_filter_registry.h
M		libs/image/floodfill/kis_scanline_fill.cpp
M		libs/image/floodfill/kis_scanline_fill.h
M		libs/image/generator/kis_generator.cpp
M		libs/image/generator/kis_generator.h
M		libs/image/generator/kis_generator_layer.cpp
M		libs/image/generator/kis_generator_layer.h
M		libs/image/generator/kis_generator_registry.cpp
M		libs/image/generator/kis_generator_registry.h
M		libs/image/kis_adjustment_layer.cc
M		libs/image/kis_adjustment_layer.h
M		libs/image/kis_algebra_2d.cpp
M		libs/image/kis_algebra_2d.h
M		libs/image/kis_async_merger.cpp
M		libs/image/kis_base_processor.cpp
M		libs/image/kis_base_processor.h
M		libs/image/kis_bookmarked_configuration_manager.cc
M		libs/image/kis_bookmarked_configuration_manager.h
M		libs/image/kis_cached_paint_device.h
M		libs/image/kis_change_profile_visitor.h
M		libs/image/kis_colorspace_convert_visitor.cpp
M		libs/image/kis_colorspace_convert_visitor.h
M		libs/image/kis_command_utils.cpp
M		libs/image/kis_command_utils.h
M		libs/image/kis_config_widget.h
M		libs/image/kis_convolution_kernel.cc
M		libs/image/kis_convolution_kernel.h
M		libs/image/kis_convolution_worker_spatial.h
M		libs/image/kis_count_visitor.h
M		libs/image/kis_fill_painter.cc
M		libs/image/kis_fill_painter.h
M		libs/image/kis_filter_mask.cpp
M		libs/image/kis_filter_mask.h
M		libs/image/kis_filter_weights_applicator.h
M		libs/image/kis_gaussian_kernel.cpp
M		libs/image/kis_gaussian_kernel.h
M		libs/image/kis_group_layer.cc
M		libs/image/kis_image.cc
M		libs/image/kis_image.h
M		libs/image/kis_indirect_painting_support.cpp
M		libs/image/kis_indirect_painting_support.h
M		libs/image/kis_layer.cc
M		libs/image/kis_layer_composition.cpp
M		libs/image/kis_layer_properties_icons.cpp
M		libs/image/kis_layer_properties_icons.h
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_layer_utils.h
A		libs/image/kis_macro_based_undo_store.cpp
P		libs/image/kis_macro_based_undo_store.h Copied from plugins/impex/video/video_export_options_dialog.h
A		libs/image/kis_marker_painter.cpp
P		libs/image/kis_marker_painter.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
M		libs/image/kis_mask.cc
M		libs/image/kis_mask.h
M		libs/image/kis_node_filter_interface.cpp
M		libs/image/kis_node_filter_interface.h
M		libs/image/kis_node_visitor.h
M		libs/image/kis_onion_skin_compositor.cpp
M		libs/image/kis_paint_device.cc
M		libs/image/kis_paint_device.h
M		libs/image/kis_paint_device_cache.h
M		libs/image/kis_paint_device_frames_interface.h
M		libs/image/kis_paint_device_strategies.h
M		libs/image/kis_painter.cc
M		libs/image/kis_painter.h
M		libs/image/kis_pixel_selection.cpp
M		libs/image/kis_pixel_selection.h
M		libs/image/kis_post_execution_undo_adapter.cpp
M		libs/image/kis_post_execution_undo_adapter.h
M		libs/image/kis_processing_visitor.h
M		libs/image/kis_properties_configuration.cc
M		libs/image/kis_properties_configuration.h
M		libs/image/kis_selection_based_layer.cpp
M		libs/image/kis_selection_based_layer.h
M		libs/image/kis_selection_filters.cpp
M		libs/image/kis_serializable_configuration.cc
M		libs/image/kis_serializable_configuration.h
M		libs/image/kis_suspend_projection_updates_stroke_strategy.cpp
M		libs/image/kis_time_range.h
M		libs/image/kis_transaction_data.cpp
M		libs/image/kis_transform_worker.cc
M		libs/image/kis_types.h
M		libs/image/kis_warptransform_worker.cc
M		libs/image/krita_utils.cpp
M		libs/image/krita_utils.h
M		libs/image/layerstyles/kis_ls_bevel_emboss_filter.cpp
M		libs/image/layerstyles/kis_ls_utils.cpp
M		libs/image/layerstyles/kis_multiple_projection.cpp
A	(dir)	libs/image/lazybrush/
A		libs/image/lazybrush/kis_colorize_mask.cpp
A		libs/image/lazybrush/kis_colorize_mask.h
A		libs/image/lazybrush/kis_colorize_stroke_strategy.cpp
P		libs/image/lazybrush/kis_colorize_stroke_strategy.h Copied from plugins/impex/video/video_export_options_dialog.h
A		libs/image/lazybrush/kis_lazy_fill_capacity_map.h
A		libs/image/lazybrush/kis_lazy_fill_graph.h
A		libs/image/lazybrush/kis_lazy_fill_tools.cpp
A		libs/image/lazybrush/kis_lazy_fill_tools.h
P		libs/image/lazybrush/kis_min_cut_worker.cpp Copied from plugins/impex/video/tests/kis_video_plugin_test.h
P		libs/image/lazybrush/kis_min_cut_worker.h Copied from plugins/impex/video/tests/kis_video_plugin_test.h
A		libs/image/lazybrush/kis_multiway_cut.cpp
P		libs/image/lazybrush/kis_multiway_cut.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
M		libs/image/metadata/kis_exif_info_visitor.h
M		libs/image/processing/kis_crop_processing_visitor.cpp
M		libs/image/processing/kis_crop_processing_visitor.h
M		libs/image/processing/kis_do_nothing_processing_visitor.cpp
M		libs/image/processing/kis_do_nothing_processing_visitor.h
M		libs/image/processing/kis_mirror_processing_visitor.cpp
M		libs/image/processing/kis_mirror_processing_visitor.h
M		libs/image/processing/kis_simple_processing_visitor.cpp
M		libs/image/processing/kis_simple_processing_visitor.h
M		libs/image/processing/kis_transform_processing_visitor.cpp
M		libs/image/processing/kis_transform_processing_visitor.h
M		libs/image/recorder/kis_recorded_action.h
M		libs/image/recorder/kis_recorded_filter_action.cpp
M		libs/image/recorder/kis_recorded_filter_action.h
M		libs/image/recorder/kis_recorded_paint_action.cpp
M		libs/image/recorder/kis_recorded_paint_action.h
M		libs/image/tests/CMakeLists.txt
A		libs/image/tests/data/fill1_a.png
A		libs/image/tests/data/fill1_b.png
A		libs/image/tests/data/fill1_main.png
A		libs/image/tests/data/fill2_a.png
A		libs/image/tests/data/fill2_b.png
A		libs/image/tests/data/fill2_main.png
A		libs/image/tests/data/fill4_a.png
A		libs/image/tests/data/fill4_b.png
A		libs/image/tests/data/fill4_c.png
A		libs/image/tests/data/fill4_d.png
A		libs/image/tests/data/fill4_e.png
A		libs/image/tests/data/fill4_main.png
A	(dir)	libs/image/tests/data/marker_painter/
A		libs/image/tests/data/marker_painter/fill_full_circle_.png
A		libs/image/tests/data/marker_painter/fill_single_diff_.png
A		libs/image/tests/data/marker_painter/fill_stroke_.png
A		libs/image/tests/data/marker_painter/half_brush_fill_.png
M		libs/image/tests/kis_adjustment_layer_test.cpp
A		libs/image/tests/kis_algebra_2d_test.cpp
P		libs/image/tests/kis_algebra_2d_test.h Copied from plugins/impex/video/tests/kis_video_plugin_test.h
M		libs/image/tests/kis_async_merger_test.cpp
D		libs/image/tests/kis_bookmarked_configuration_manager_test.cpp
P		libs/image/tests/kis_bookmarked_configuration_manager_test.h Deleted after being copied to multiple locations: libs/image/tests/kis_colorize_mask_test.h plugins/extensions/animationrenderer/AnimationRenderer.h
A		libs/image/tests/kis_colorize_mask_test.cpp
P		libs/image/tests/kis_colorize_mask_test.h Copied from libs/image/tests/kis_bookmarked_configuration_manager_test.h
M		libs/image/tests/kis_convolution_painter_test.cpp
M		libs/image/tests/kis_cs_conversion_test.cpp
M		libs/image/tests/kis_filter_config_widget_test.cpp
M		libs/image/tests/kis_filter_configuration_test.cpp
M		libs/image/tests/kis_filter_mask_test.cpp
M		libs/image/tests/kis_filter_test.cpp
M		libs/image/tests/kis_image_test.cpp
M		libs/image/tests/kis_layer_test.cpp
A		libs/image/tests/kis_lazy_brush_test.cpp
P		libs/image/tests/kis_lazy_brush_test.h Copied from plugins/impex/video/tests/kis_video_plugin_test.h
A		libs/image/tests/kis_marker_painter_test.cpp
P		libs/image/tests/kis_marker_painter_test.h Copied from plugins/impex/video/tests/kis_video_plugin_test.h
M		libs/image/tests/kis_node_visitor_test.cpp
M		libs/image/tests/kis_paint_device_test.cpp
M		libs/image/tests/kis_properties_configuration_test.cpp
M		libs/image/tests/kis_properties_configuration_test.h
M		libs/image/tests/kis_recorded_filter_action_test.cpp
M		libs/image/tests/kis_scanline_fill_test.cpp
M		libs/image/tests/kis_scanline_fill_test.h
M		libs/image/tests/kis_selection_test.cpp
M		libs/image/tests/kis_simple_update_queue_test.cpp
M		libs/image/tests/kis_transaction_test.cpp
M		libs/image/tests/kis_update_scheduler_test.cpp
M		libs/image/tests/kis_walkers_test.cpp
M		libs/koplugin/KoJsonTrader.cpp
M		libs/pigment/KoColor.cpp
M		libs/pigment/KoColor.h
M		libs/pigment/KoColorConversions.cpp
M		libs/pigment/KoColorDisplayRendererInterface.cpp
M		libs/pigment/KoColorDisplayRendererInterface.h
M		libs/pigment/KoColorSpace.h
M		libs/pigment/KoColorSpaceTraits.h
M		libs/pigment/resources/KoColorSet.cpp
M		libs/pigment/resources/KoColorSet.h
M		libs/pigment/resources/KoSegmentGradient.cpp
M		libs/pigment/resources/KoStopGradient.cpp
M		libs/ui/CMakeLists.txt
M		libs/ui/KisApplication.cpp
M		libs/ui/KisColorsetChooser.cpp
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisFilterChain.cpp
M		libs/ui/KisFilterChain.h
M		libs/ui/KisFilterChainLink.cpp
M		libs/ui/KisFilterChainLink.h
M		libs/ui/KisFilterEntry.cpp
M		libs/ui/KisFilterEntry.h
M		libs/ui/KisFilterGraph.cpp
M		libs/ui/KisImportExportFilter.cpp
M		libs/ui/KisImportExportFilter.h
M		libs/ui/KisImportExportManager.cpp
M		libs/ui/KisImportExportManager.h
M		libs/ui/KisMainWindow.cpp
M		libs/ui/KisMainWindow.h
M		libs/ui/KisPaletteModel.cpp
M		libs/ui/KisPaletteModel.h
M		libs/ui/KisSaveGroupVisitor.cpp
M		libs/ui/KisSaveGroupVisitor.h
M		libs/ui/KisTemplateTree.cpp
M		libs/ui/KisTemplatesPane.cpp
M		libs/ui/KisViewManager.cpp
M		libs/ui/KisViewManager.h
M		libs/ui/actions/kis_selection_action_factories.cpp
M		libs/ui/actions/kis_selection_action_factories.h
M		libs/ui/brushhud/kis_round_hud_button.cpp
M		libs/ui/canvas/kis_abstract_canvas_widget.h
M		libs/ui/canvas/kis_canvas2.cpp
M		libs/ui/canvas/kis_canvas2.h
M		libs/ui/canvas/kis_canvas_widget_base.cpp
M		libs/ui/canvas/kis_canvas_widget_base.h
M		libs/ui/canvas/kis_display_color_converter.cpp
M		libs/ui/canvas/kis_display_color_converter.h
M		libs/ui/canvas/kis_image_pyramid.cpp
M		libs/ui/canvas/kis_image_pyramid.h
M		libs/ui/canvas/kis_prescaled_projection.cpp
M		libs/ui/canvas/kis_prescaled_projection.h
M		libs/ui/canvas/kis_projection_backend.h
M		libs/ui/canvas/kis_qpainter_canvas.cpp
M		libs/ui/canvas/kis_qpainter_canvas.h
M		libs/ui/dialogs/kis_about_application.cpp
M		libs/ui/dialogs/kis_dlg_adj_layer_props.cc
M		libs/ui/dialogs/kis_dlg_adj_layer_props.h
M		libs/ui/dialogs/kis_dlg_adjustment_layer.cc
M		libs/ui/dialogs/kis_dlg_adjustment_layer.h
M		libs/ui/dialogs/kis_dlg_filter.cpp
M		libs/ui/dialogs/kis_dlg_filter.h
M		libs/ui/dialogs/kis_dlg_generator_layer.cpp
M		libs/ui/dialogs/kis_dlg_generator_layer.h
M		libs/ui/dialogs/kis_dlg_image_properties.cc
M		libs/ui/dialogs/kis_dlg_image_properties.h
A		libs/ui/dialogs/kis_dlg_internal_color_selector.cpp
A		libs/ui/dialogs/kis_dlg_internal_color_selector.h
M		libs/ui/dialogs/kis_dlg_layer_style.cpp
M		libs/ui/dialogs/kis_dlg_preferences.cc
M		libs/ui/dialogs/kis_dlg_preferences.h
A		libs/ui/dialogs/kis_dlg_stroke_selection_properties.cpp
A		libs/ui/dialogs/kis_dlg_stroke_selection_properties.h
M		libs/ui/forms/wdgautogradient.ui
M		libs/ui/forms/wdgcolorsettings.ui
M		libs/ui/forms/wdgdisplaysettings.ui
A		libs/ui/forms/wdgdlginternalcolorselector.ui
M		libs/ui/forms/wdggeneralsettings.ui
M		libs/ui/forms/wdgimageproperties.ui
M		libs/ui/forms/wdgnewimage.ui
M		libs/ui/forms/wdgpaintactioneditor.ui
M		libs/ui/forms/wdgpaintopsettings.ui
A		libs/ui/forms/wdgstopgradienteditor.ui
A		libs/ui/forms/wdgstrokeselectionproperties.ui
M		libs/ui/kis_action.h
M		libs/ui/kis_action_manager.cpp
M		libs/ui/kis_action_manager.h
M		libs/ui/kis_animation_exporter.cpp
M		libs/ui/kis_animation_exporter.h
M		libs/ui/kis_autogradient.cc
M		libs/ui/kis_autogradient.h
M		libs/ui/kis_bookmarked_configurations_editor.cc
M		libs/ui/kis_bookmarked_configurations_editor.h
M		libs/ui/kis_bookmarked_configurations_model.cc
M		libs/ui/kis_bookmarked_configurations_model.h
M		libs/ui/kis_bookmarked_filter_configurations_model.cc
M		libs/ui/kis_bookmarked_filter_configurations_model.h
M		libs/ui/kis_canvas_controls_manager.cpp
M		libs/ui/kis_canvas_resource_provider.cpp
M		libs/ui/kis_canvas_resource_provider.h
M		libs/ui/kis_config.cc
M		libs/ui/kis_config.h
M		libs/ui/kis_control_frame.cpp
M		libs/ui/kis_control_frame.h
M		libs/ui/kis_custom_pattern.cc
M		libs/ui/kis_filter_manager.cc
M		libs/ui/kis_filter_manager.h
M		libs/ui/kis_layer_manager.cc
M		libs/ui/kis_layer_manager.h
M		libs/ui/kis_mask_manager.cc
M		libs/ui/kis_mask_manager.h
M		libs/ui/kis_node_juggler_compressed.cpp
M		libs/ui/kis_node_manager.cpp
M		libs/ui/kis_node_manager.h
M		libs/ui/kis_painting_assistant.cc
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_paintop_box.h
M		libs/ui/kis_paintop_option.cpp
M		libs/ui/kis_paintop_option.h
M		libs/ui/kis_paintop_settings_widget.cpp
M		libs/ui/kis_paintop_settings_widget.h
A		libs/ui/kis_palette_delegate.cpp
P		libs/ui/kis_palette_delegate.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
A		libs/ui/kis_palette_view.cpp
P		libs/ui/kis_palette_view.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
M		libs/ui/kis_popup_palette.cpp
M		libs/ui/kis_popup_palette.h
M		libs/ui/kis_selection_manager.cc
M		libs/ui/kis_selection_manager.h
A		libs/ui/kis_stopgradient_editor.cpp
P		libs/ui/kis_stopgradient_editor.h Copied from plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.h
A		libs/ui/kra/kis_colorize_dom_utils.cpp
P		libs/ui/kra/kis_colorize_dom_utils.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
M		libs/ui/kra/kis_kra_load_visitor.cpp
M		libs/ui/kra/kis_kra_load_visitor.h
M		libs/ui/kra/kis_kra_loader.cpp
M		libs/ui/kra/kis_kra_loader.h
M		libs/ui/kra/kis_kra_save_visitor.cpp
M		libs/ui/kra/kis_kra_save_visitor.h
M		libs/ui/kra/kis_kra_savexml_visitor.cpp
M		libs/ui/kra/kis_kra_savexml_visitor.h
M		libs/ui/kra/kis_kra_tags.h
M		libs/ui/layerstyles/WdgColorOverlay.ui
M		libs/ui/layerstyles/WdgSatin.ui
M		libs/ui/layerstyles/WdgStroke.ui
M		libs/ui/layerstyles/wdgBevelAndEmboss.ui
M		libs/ui/layerstyles/wdgInnerGlow.ui
M		libs/ui/layerstyles/wdgdropshadow.ui
M		libs/ui/opengl/kis_opengl.cpp
M		libs/ui/opengl/kis_opengl.h
M		libs/ui/opengl/kis_opengl_canvas2.cpp
M		libs/ui/opengl/kis_opengl_canvas2.h
A		libs/ui/opengl/kis_opengl_shader_loader.cpp
A		libs/ui/opengl/kis_opengl_shader_loader.h
M		libs/ui/operations/kis_operation_configuration.h
M		libs/ui/operations/kis_operation_ui_factory.h
M		libs/ui/operations/kis_operation_ui_widget.h
M		libs/ui/operations/kis_operation_ui_widget_factory.h
M		libs/ui/ora/kis_open_raster_stack_load_visitor.cpp
M		libs/ui/ora/kis_open_raster_stack_save_visitor.h
M		libs/ui/processing/fill_processing_visitor.cpp
M		libs/ui/processing/fill_processing_visitor.h
M		libs/ui/recorder/kis_recorded_filter_action_creator.cpp
M		libs/ui/recorder/kis_recorded_filter_action_editor.cc
M		libs/ui/recorder/kis_recorded_paint_action_editor.cc
M		libs/ui/recorder/kis_recorded_paint_action_editor.h
M		libs/ui/tests/filter_stroke_test.cpp
M		libs/ui/tests/kis_kra_loader_test.cpp
M		libs/ui/tests/kis_kra_saver_test.cpp
M		libs/ui/tests/kis_kra_saver_test.h
M		libs/ui/tests/kis_node_manager_test.cpp
M		libs/ui/tests/kis_selection_manager_test.cpp
M		libs/ui/tests/kis_zoom_and_pan_test.cpp
M		libs/ui/tests/util.h
M		libs/ui/tool/kis_figure_painting_tool_helper.cpp
M		libs/ui/tool/kis_figure_painting_tool_helper.h
M		libs/ui/tool/kis_resources_snapshot.cpp
M		libs/ui/tool/kis_resources_snapshot.h
M		libs/ui/tool/kis_tool.cc
M		libs/ui/tool/kis_tool.h
M		libs/ui/tool/kis_tool_freehand_helper.cpp
M		libs/ui/tool/kis_tool_freehand_helper.h
M		libs/ui/tool/strokes/freehand_stroke.cpp
M		libs/ui/tool/strokes/freehand_stroke.h
M		libs/ui/tool/strokes/kis_filter_stroke_strategy.cpp
M		libs/ui/tool/strokes/kis_filter_stroke_strategy.h
M		libs/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
V		libs/{ui ← }/widgets/KoDualColorButton.cpp
V		libs/{ui ← }/widgets/KoDualColorButton.h
M		libs/ui/widgets/kis_cmb_idlist.cc
M		libs/ui/widgets/kis_cmb_idlist.h
A		libs/ui/widgets/kis_color_button.cpp
A		libs/ui/widgets/kis_color_button.h
V		{libs/ui/widgets/kis_color_input.cpp ← plugins/dockers/specificcolorselector/kis_color_input.cc}
V		{libs/ui/widgets ← plugins/dockers/specificcolorselector}/kis_color_input.h
M		libs/ui/widgets/kis_custom_image_widget.cc
M		libs/ui/widgets/kis_custom_image_widget.h
M		libs/ui/widgets/kis_filter_selector_widget.cc
M		libs/ui/widgets/kis_filter_selector_widget.h
M		libs/ui/widgets/kis_gradient_chooser.cc
M		libs/ui/widgets/kis_gradient_chooser.h
M		libs/ui/widgets/kis_multi_bool_filter_widget.cc
M		libs/ui/widgets/kis_multi_bool_filter_widget.h
M		libs/ui/widgets/kis_multi_double_filter_widget.cc
M		libs/ui/widgets/kis_multi_double_filter_widget.h
M		libs/ui/widgets/kis_multi_integer_filter_widget.cc
M		libs/ui/widgets/kis_multi_integer_filter_widget.h
M		libs/ui/widgets/kis_paintop_presets_popup.cpp
M		libs/ui/widgets/kis_paintop_presets_popup.h
M		libs/ui/widgets/kis_scratch_pad.cpp
A		libs/ui/widgets/kis_screen_color_picker.cpp
A		libs/ui/widgets/kis_screen_color_picker.h
A		libs/ui/widgets/kis_spinbox_color_selector.cpp
A		libs/ui/widgets/kis_spinbox_color_selector.h
A		libs/ui/widgets/kis_stopgradient_slider_widget.cpp
A		libs/ui/widgets/kis_stopgradient_slider_widget.h
A		libs/ui/widgets/kis_visual_color_selector.cpp
A		libs/ui/widgets/kis_visual_color_selector.h
M		libs/ui/widgets/kis_wdg_generator.cpp
M		libs/ui/widgets/kis_wdg_generator.h
M		libs/widgets/CMakeLists.txt
M		libs/widgets/KoColorPatch.cpp
M		libs/widgets/KoColorPatch.h
M		libs/widgets/KoColorSetWidget.cpp
M		libs/widgets/KoColorSetWidget.h
M		libs/widgets/KoColorSetWidget_p.h
V		libs/{ → ui}/widgets/KoDualColorButton.cpp
V		libs/{ → ui}/widgets/KoDualColorButton.h
M		libs/widgets/KoEditColorSetDialog.cpp
M		libs/widgets/KoPageLayoutWidget.ui
M		libs/widgets/KoResourcePopupAction.cpp
M		libs/widgets/KoResourceTagStore.cpp
M		libs/widgets/kis_file_name_requester.cpp
M		libs/widgets/kis_file_name_requester.h
M		libs/widgetutils/KoResourcePaths.cpp
M		libs/widgetutils/KoResourcePaths.h
M		packaging/linux/appimage/build-deps.sh
M		packaging/linux/appimage/build-image.sh
M		plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc
M		plugins/color/lcms2engine/colorprofiles/LcmsColorProfileContainer.cpp
M		plugins/dockers/advancedcolorselector/kis_color_selector_ring.cpp
M		plugins/dockers/animation/onion_skins_docker.cpp
M		plugins/dockers/animation/onion_skins_docker.ui
M		plugins/dockers/channeldocker/channelmodel.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/dockers/digitalmixer/digitalmixer_dock.cc
M		plugins/dockers/digitalmixer/digitalmixer_dock.h
M		plugins/dockers/griddocker/grid_config_widget.ui
M		plugins/dockers/histogram/histogramdocker_dock.cpp
M		plugins/dockers/histogram/histogramdockerwidget.cpp
M		plugins/dockers/lut/lutdocker_dock.cpp
M		plugins/dockers/lut/lutdocker_dock.h
M		plugins/dockers/lut/ocio_display_filter.cpp
M		plugins/dockers/lut/ocio_display_filter.h
M		plugins/dockers/lut/tests/kis_ocio_display_filter_test.cpp
M		plugins/dockers/palettedocker/palettedocker_dock.cpp
M		plugins/dockers/palettedocker/palettedocker_dock.h
M		plugins/dockers/palettedocker/wdgpalettedock.ui
M		plugins/dockers/specificcolorselector/CMakeLists.txt
V		{plugins/dockers/specificcolorselector/kis_color_input.cc → libs/ui/widgets/kis_color_input.cpp}
V		{plugins/dockers/specificcolorselector → libs/ui/widgets}/kis_color_input.h
M		plugins/dockers/specificcolorselector/kis_specific_color_selector_widget.cc
M		plugins/extensions/CMakeLists.txt
A	(dir)	plugins/extensions/animationrenderer/
A		plugins/extensions/animationrenderer/AnimationRenderer.cpp
V		{plugins/extensions/animationrenderer/AnimationRenderer.h ← libs/image/tests/kis_bookmarked_configuration_manager_test.h}
A		plugins/extensions/animationrenderer/CMakeLists.txt
A		plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
A		plugins/extensions/animationrenderer/DlgAnimationRenderer.h
A		plugins/extensions/animationrenderer/kritaanimationrenderer.json
A		plugins/extensions/animationrenderer/wdg_animationrenderer.ui
M		plugins/extensions/gmic/CMakeLists.txt
M		plugins/extensions/gmic/kis_export_gmic_processing_visitor.h
M		plugins/extensions/gmic/kis_gmic_settings_widget.h
M		plugins/extensions/gmic/kis_import_gmic_processing_visitor.cpp
M		plugins/extensions/gmic/kis_import_gmic_processing_visitor.h
M		plugins/extensions/layersplit/dlg_layersplit.cpp
M		plugins/extensions/layersplit/dlg_layersplit.h
M		plugins/extensions/layersplit/layersplit.cpp
M		plugins/extensions/layersplit/wdg_layersplit.ui
M		plugins/extensions/modify_selection/dlg_border_selection.cc
M		plugins/extensions/modify_selection/dlg_border_selection.h
M		plugins/extensions/modify_selection/dlg_feather_selection.cc
M		plugins/extensions/modify_selection/dlg_feather_selection.h
M		plugins/extensions/modify_selection/dlg_grow_selection.cc
M		plugins/extensions/modify_selection/dlg_grow_selection.h
M		plugins/extensions/modify_selection/dlg_shrink_selection.cc
M		plugins/extensions/modify_selection/dlg_shrink_selection.h
M		plugins/extensions/offsetimage/kis_offset_processing_visitor.cpp
M		plugins/extensions/offsetimage/kis_offset_processing_visitor.h
M		plugins/extensions/waveletdecompose/kis_wavelet_kernel.cpp
M		plugins/extensions/waveletdecompose/kis_wavelet_kernel.h
M		plugins/filters/CMakeLists.txt
M		plugins/filters/blur/kis_blur_filter.cpp
M		plugins/filters/blur/kis_blur_filter.h
M		plugins/filters/blur/kis_gaussian_blur_filter.cpp
M		plugins/filters/blur/kis_gaussian_blur_filter.h
M		plugins/filters/blur/kis_lens_blur_filter.cpp
M		plugins/filters/blur/kis_lens_blur_filter.h
M		plugins/filters/blur/kis_motion_blur_filter.cpp
M		plugins/filters/blur/kis_motion_blur_filter.h
M		plugins/filters/blur/kis_wdg_blur.cpp
M		plugins/filters/blur/kis_wdg_blur.h
M		plugins/filters/blur/kis_wdg_gaussian_blur.cpp
M		plugins/filters/blur/kis_wdg_gaussian_blur.h
M		plugins/filters/blur/kis_wdg_lens_blur.cpp
M		plugins/filters/blur/kis_wdg_lens_blur.h
M		plugins/filters/blur/kis_wdg_motion_blur.cpp
M		plugins/filters/blur/kis_wdg_motion_blur.h
M		plugins/filters/colors/kis_color_to_alpha.cpp
M		plugins/filters/colors/kis_color_to_alpha.h
M		plugins/filters/colors/kis_minmax_filters.cpp
M		plugins/filters/colors/kis_minmax_filters.h
M		plugins/filters/colors/kis_wdg_color_to_alpha.cpp
M		plugins/filters/colors/kis_wdg_color_to_alpha.h
M		plugins/filters/colors/wdgcolortoalphabase.ui
M		plugins/filters/colorsfilters/colorsfilters.cpp
M		plugins/filters/colorsfilters/colorsfilters.h
M		plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
M		plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
M		plugins/filters/colorsfilters/kis_color_balance_filter.cpp
M		plugins/filters/colorsfilters/kis_color_balance_filter.h
M		plugins/filters/colorsfilters/kis_desaturate_filter.cpp
M		plugins/filters/colorsfilters/kis_desaturate_filter.h
M		plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
M		plugins/filters/colorsfilters/kis_hsv_adjustment_filter.h
M		plugins/filters/colorsfilters/kis_perchannel_filter.cpp
M		plugins/filters/colorsfilters/kis_perchannel_filter.h
M		plugins/filters/convolutionfilters/convolutionfilters.cpp
M		plugins/filters/convolutionfilters/kis_convolution_filter.cpp
M		plugins/filters/convolutionfilters/kis_convolution_filter.h
M		plugins/filters/dodgeburn/DodgeBurn.cpp
M		plugins/filters/dodgeburn/DodgeBurn.h
M		plugins/filters/embossfilter/kis_emboss_filter.cpp
M		plugins/filters/embossfilter/kis_emboss_filter.h
M		plugins/filters/example/example.cpp
M		plugins/filters/example/example.h
M		plugins/filters/fastcolortransfer/fastcolortransfer.cpp
M		plugins/filters/fastcolortransfer/fastcolortransfer.h
M		plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
M		plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h
M		plugins/filters/gradientmap/gradientmap.cpp
M		plugins/filters/gradientmap/gradientmap.h
M		plugins/filters/gradientmap/krita_filter_gradient_map.cpp
M		plugins/filters/gradientmap/krita_filter_gradient_map.h
A	(dir)	plugins/filters/halftone/
A		plugins/filters/halftone/CMakeLists.txt
A		plugins/filters/halftone/kis_halftone_filter.cpp
A		plugins/filters/halftone/kis_halftone_filter.h
A		plugins/filters/halftone/kritahalftone.json
A		plugins/filters/halftone/wdg_halftone_filter.ui
M		plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
M		plugins/filters/imageenhancement/kis_simple_noise_reducer.h
M		plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
M		plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h
M		plugins/filters/indexcolors/indexcolors.cpp
M		plugins/filters/indexcolors/indexcolors.h
M		plugins/filters/indexcolors/kiswdgindexcolors.cpp
M		plugins/filters/indexcolors/kiswdgindexcolors.h
M		plugins/filters/levelfilter/kis_level_filter.cpp
M		plugins/filters/levelfilter/kis_level_filter.h
M		plugins/filters/noisefilter/kis_wdg_noise.cpp
M		plugins/filters/noisefilter/kis_wdg_noise.h
M		plugins/filters/noisefilter/noisefilter.cpp
M		plugins/filters/noisefilter/noisefilter.h
M		plugins/filters/normalize/kis_normalize.cpp
M		plugins/filters/normalize/kis_normalize.h
M		plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
M		plugins/filters/oilpaintfilter/kis_oilpaint_filter.h
M		plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
M		plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.h
M		plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp
M		plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.h
M		plugins/filters/phongbumpmap/phong_pixel_processor.cpp
M		plugins/filters/phongbumpmap/phong_pixel_processor.h
M		plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
M		plugins/filters/pixelizefilter/kis_pixelize_filter.h
M		plugins/filters/posterize/posterize.cpp
M		plugins/filters/posterize/posterize.h
M		plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
M		plugins/filters/raindropsfilter/kis_raindrops_filter.h
M		plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
M		plugins/filters/randompickfilter/kis_wdg_random_pick.h
M		plugins/filters/randompickfilter/randompickfilter.cpp
M		plugins/filters/randompickfilter/randompickfilter.h
M		plugins/filters/roundcorners/kis_round_corners_filter.cpp
M		plugins/filters/roundcorners/kis_round_corners_filter.h
M		plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
M		plugins/filters/smalltilesfilter/kis_small_tiles_filter.h
M		plugins/filters/sobelfilter/kis_sobel_filter.cpp
M		plugins/filters/sobelfilter/kis_sobel_filter.h
M		plugins/filters/tests/kis_all_filter_test.cpp
M		plugins/filters/tests/kis_crash_filter_test.cpp
M		plugins/filters/threshold/threshold.cpp
M		plugins/filters/threshold/threshold.h
M		plugins/filters/unsharp/kis_unsharp_filter.cpp
M		plugins/filters/unsharp/kis_unsharp_filter.h
M		plugins/filters/unsharp/kis_wdg_unsharp.cpp
M		plugins/filters/unsharp/kis_wdg_unsharp.h
M		plugins/filters/unsharp/tests/kis_unsharp_mask_test.cpp
M		plugins/filters/wavefilter/kis_wdg_wave.cpp
M		plugins/filters/wavefilter/kis_wdg_wave.h
M		plugins/filters/wavefilter/wavefilter.cpp
M		plugins/filters/wavefilter/wavefilter.h
M		plugins/flake/textshape/kotext/styles/KoStyleManager.cpp
M		plugins/generators/pattern/kis_wdg_pattern.cpp
M		plugins/generators/pattern/kis_wdg_pattern.h
M		plugins/generators/pattern/patterngenerator.cpp
M		plugins/generators/pattern/patterngenerator.h
M		plugins/generators/pattern/wdgpatternoptions.ui
M		plugins/generators/solid/colorgenerator.cpp
M		plugins/generators/solid/colorgenerator.h
M		plugins/generators/solid/kis_wdg_color.cpp
M		plugins/generators/solid/kis_wdg_color.h
M		plugins/generators/solid/wdgcoloroptions.ui
M		plugins/impex/CMakeLists.txt
M		plugins/impex/bmp/kis_bmp_export.cpp
M		plugins/impex/bmp/kis_bmp_export.h
M		plugins/impex/bmp/kis_bmp_import.cpp
M		plugins/impex/bmp/kis_bmp_import.h
M		plugins/impex/brush/kis_brush_export.cpp
M		plugins/impex/brush/kis_brush_export.h
M		plugins/impex/brush/kis_brush_import.cpp
M		plugins/impex/brush/kis_brush_import.h
M		plugins/impex/csv/kis_csv_export.cpp
M		plugins/impex/csv/kis_csv_export.h
M		plugins/impex/csv/kis_csv_import.cpp
M		plugins/impex/csv/kis_csv_import.h
M		plugins/impex/exr/exr_export.cc
M		plugins/impex/exr/exr_export.h
M		plugins/impex/exr/exr_export_widget.ui
M		plugins/impex/exr/exr_import.cc
M		plugins/impex/exr/exr_import.h
M		plugins/impex/heightmap/kis_heightmap_export.cpp
M		plugins/impex/heightmap/kis_heightmap_export.h
M		plugins/impex/heightmap/kis_heightmap_import.cpp
M		plugins/impex/heightmap/kis_heightmap_import.h
M		plugins/impex/jpeg/kis_jpeg_export.cc
M		plugins/impex/jpeg/kis_jpeg_export.h
M		plugins/impex/jpeg/kis_jpeg_import.cc
M		plugins/impex/jpeg/kis_jpeg_import.h
M		plugins/impex/jpeg/kis_wdg_options_jpeg.ui
M		plugins/impex/odg/kis_odg_import.cc
M		plugins/impex/odg/kis_odg_import.h
M		plugins/impex/ora/ora_converter.cc
M		plugins/impex/ora/ora_export.cc
M		plugins/impex/ora/ora_export.h
M		plugins/impex/ora/ora_import.cc
M		plugins/impex/ora/ora_import.h
M		plugins/impex/pdf/kis_pdf_import.cpp
M		plugins/impex/pdf/kis_pdf_import.h
M		plugins/impex/png/kis_png_export.cc
M		plugins/impex/png/kis_png_export.h
M		plugins/impex/png/kis_png_import.cc
M		plugins/impex/png/kis_png_import.h
M		plugins/impex/png/kis_wdg_options_png.ui
M		plugins/impex/ppm/kis_ppm_export.cpp
M		plugins/impex/ppm/kis_ppm_export.h
M		plugins/impex/ppm/kis_ppm_import.cpp
M		plugins/impex/ppm/kis_ppm_import.h
M		plugins/impex/ppm/kis_wdg_options_ppm.ui
M		plugins/impex/psd/psd_export.cc
M		plugins/impex/psd/psd_export.h
M		plugins/impex/psd/psd_import.cc
M		plugins/impex/psd/psd_import.h
M		plugins/impex/psd/psd_layer_record.cpp
M		plugins/impex/psd/psd_layer_section.cpp
M		plugins/impex/qml/qml_export.cc
M		plugins/impex/qml/qml_export.h
M		plugins/impex/raw/kis_raw_import.cpp
M		plugins/impex/raw/kis_raw_import.h
M		plugins/impex/spriter/kis_spriter_export.cpp
M		plugins/impex/spriter/kis_spriter_export.h
M		plugins/impex/tga/kis_tga_export.cpp
M		plugins/impex/tga/kis_tga_export.h
M		plugins/impex/tga/kis_tga_import.cpp
M		plugins/impex/tga/kis_tga_import.h
M		plugins/impex/tiff/kis_dlg_options_tiff.cpp
M		plugins/impex/tiff/kis_dlg_options_tiff.h
M		plugins/impex/tiff/kis_tiff_export.cc
M		plugins/impex/tiff/kis_tiff_export.h
M		plugins/impex/tiff/kis_tiff_import.cc
M		plugins/impex/tiff/kis_tiff_import.h
M		plugins/impex/tiff/kis_tiff_writer_visitor.h
M		plugins/impex/video/CMakeLists.txt
M		plugins/impex/video/kis_video_export.cpp
M		plugins/impex/video/kis_video_export.h
M		plugins/impex/video/krita_video_export.json
D		plugins/impex/video/tests
D		plugins/impex/video/tests/CMakeLists.txt
D		plugins/impex/video/tests/data
D		plugins/impex/video/tests/data/test_animation_small.kra
D		plugins/impex/video/tests/kis_video_plugin_test.cpp
P		plugins/impex/video/tests/kis_video_plugin_test.h Deleted after being copied to multiple locations: libs/image/brushengine/kis_slider_based_paintop_property.cpp libs/image/lazybrush/kis_min_cut_worker.cpp libs/image/lazybrush/kis_min_cut_worker.h libs/image/tests/kis_algebra_2d_test.h libs/image/tests/kis_lazy_brush_test.h libs/image/tests/kis_marker_painter_test.h plugins/paintops/roundmarker/roundmarker_paintop_plugin.h plugins/tools/tool_lazybrush/tool_lazybrush.h
M		plugins/impex/video/video_export_options_dialog.cpp
P		plugins/impex/video/video_export_options_dialog.h Copied to multiple locations: libs/image/kis_macro_based_undo_store.h libs/image/lazybrush/kis_colorize_stroke_strategy.h
M		plugins/impex/video/video_export_options_dialog.ui
M		plugins/impex/video/video_saver.cpp
M		plugins/impex/video/video_saver.h
M		plugins/impex/xcf/kis_xcf_import.cpp
M		plugins/impex/xcf/kis_xcf_import.h
M		plugins/paintops/CMakeLists.txt
M		plugins/paintops/chalk/chalk_paintop_plugin.cpp
M		plugins/paintops/chalk/kis_chalk_paintop.cpp
M		plugins/paintops/chalk/kis_chalk_paintop.h
M		plugins/paintops/chalk/kis_chalk_paintop_settings.cpp
M		plugins/paintops/chalk/kis_chalk_paintop_settings.h
M		plugins/paintops/chalk/kis_chalk_paintop_settings_widget.cpp
M		plugins/paintops/chalk/kis_chalk_paintop_settings_widget.h
M		plugins/paintops/chalk/kis_chalkop_option.cpp
M		plugins/paintops/chalk/kis_chalkop_option.h
M		plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
M		plugins/paintops/colorsmudge/kis_colorsmudgeop.h
M		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.cpp
P		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h Copied to multiple locations: libs/image/kis_marker_painter.h libs/image/lazybrush/kis_multiway_cut.h libs/ui/kis_palette_delegate.h libs/ui/kis_palette_view.h libs/ui/kra/kis_colorize_dom_utils.h plugins/paintops/roundmarker/kis_roundmarkerop_settings_widget.h plugins/tools/tool_lazybrush/tool_lazybrush.cpp
M		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
M		plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.h
M		plugins/paintops/colorsmudge/kis_overlay_mode_option.h
M		plugins/paintops/colorsmudge/kis_smudge_option.cpp
M		plugins/paintops/colorsmudge/kis_smudge_option.h
M		plugins/paintops/colorsmudge/kis_smudge_option_widget.cpp
M		plugins/paintops/colorsmudge/kis_smudge_option_widget.h
M		plugins/paintops/colorsmudge/kis_smudge_radius_option.cpp
M		plugins/paintops/colorsmudge/kis_smudge_radius_option.h
M		plugins/paintops/curvebrush/kis_curve_line_option.cpp
M		plugins/paintops/curvebrush/kis_curve_line_option.h
M		plugins/paintops/curvebrush/kis_curve_paintop.cpp
M		plugins/paintops/curvebrush/kis_curve_paintop.h
M		plugins/paintops/curvebrush/kis_curve_paintop_settings.cpp
M		plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.cpp
M		plugins/paintops/curvebrush/kis_curve_paintop_settings_widget.h
M		plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
M		plugins/paintops/defaultpaintops/brush/kis_brushop.h
M		plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
P		plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.h Copied to libs/ui/kis_stopgradient_editor.h
M		plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_option.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.cpp
M		plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings_widget.h
M		plugins/paintops/defaultpresets/CMakeLists.txt
A		plugins/paintops/defaultpresets/roundmarker.kpp
M		plugins/paintops/deform/kis_brush_size_option.cpp
M		plugins/paintops/deform/kis_brush_size_option.h
M		plugins/paintops/deform/kis_deform_option.cpp
M		plugins/paintops/deform/kis_deform_option.h
M		plugins/paintops/deform/kis_deform_paintop.cpp
M		plugins/paintops/deform/kis_deform_paintop.h
M		plugins/paintops/deform/kis_deform_paintop_settings.cpp
M		plugins/paintops/deform/kis_deform_paintop_settings.h
M		plugins/paintops/deform/kis_deform_paintop_settings_widget.h
M		plugins/paintops/dynadraw/kis_dyna_paintop.cpp
M		plugins/paintops/dynadraw/kis_dyna_paintop.h
M		plugins/paintops/dynadraw/kis_dyna_paintop_settings.cpp
M		plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp
M		plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.h
M		plugins/paintops/dynadraw/kis_dynaop_option.cpp
M		plugins/paintops/dynadraw/kis_dynaop_option.h
M		plugins/paintops/experiment/kis_experiment_paintop.cpp
M		plugins/paintops/experiment/kis_experiment_paintop.h
M		plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
M		plugins/paintops/experiment/kis_experiment_paintop_settings.h
M		plugins/paintops/experiment/kis_experiment_paintop_settings_widget.cpp
M		plugins/paintops/experiment/kis_experiment_paintop_settings_widget.h
M		plugins/paintops/experiment/kis_experimentop_option.cpp
M		plugins/paintops/experiment/kis_experimentop_option.h
M		plugins/paintops/filterop/kis_filterop.cpp
M		plugins/paintops/filterop/kis_filterop.h
M		plugins/paintops/filterop/kis_filterop_settings.cpp
M		plugins/paintops/filterop/kis_filterop_settings.h
M		plugins/paintops/filterop/kis_filterop_settings_widget.cpp
M		plugins/paintops/filterop/kis_filterop_settings_widget.h
M		plugins/paintops/gridbrush/kis_grid_paintop.cpp
M		plugins/paintops/gridbrush/kis_grid_paintop.h
M		plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
P		plugins/paintops/gridbrush/kis_grid_paintop_settings.h Copied to plugins/paintops/roundmarker/kis_roundmarkerop_settings.h
M		plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
M		plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.h
M		plugins/paintops/gridbrush/kis_grid_shape_option.cpp
M		plugins/paintops/gridbrush/kis_grid_shape_option.h
M		plugins/paintops/gridbrush/kis_gridop_option.cpp
M		plugins/paintops/gridbrush/kis_gridop_option.h
M		plugins/paintops/hairy/kis_hairy_bristle_option.cpp
M		plugins/paintops/hairy/kis_hairy_bristle_option.h
M		plugins/paintops/hairy/kis_hairy_ink_option.cpp
M		plugins/paintops/hairy/kis_hairy_ink_option.h
M		plugins/paintops/hairy/kis_hairy_paintop.cpp
M		plugins/paintops/hairy/kis_hairy_paintop.h
M		plugins/paintops/hairy/kis_hairy_paintop_settings.cpp
M		plugins/paintops/hairy/kis_hairy_paintop_settings.h
M		plugins/paintops/hairy/kis_hairy_paintop_settings_widget.cpp
M		plugins/paintops/hairy/kis_hairy_paintop_settings_widget.h
M		plugins/paintops/hairy/kis_hairy_shape_option.cpp
M		plugins/paintops/hairy/kis_hairy_shape_option.h
M		plugins/paintops/hairy/wdghairyshapeoptions.ui
M		plugins/paintops/hatching/hatching_brush.cpp
M		plugins/paintops/hatching/hatching_brush.h
M		plugins/paintops/hatching/kis_hatching_options.cpp
M		plugins/paintops/hatching/kis_hatching_options.h
M		plugins/paintops/hatching/kis_hatching_paintop.cpp
M		plugins/paintops/hatching/kis_hatching_paintop.h
M		plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
M		plugins/paintops/hatching/kis_hatching_paintop_settings.h
M		plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
M		plugins/paintops/hatching/kis_hatching_paintop_settings_widget.h
M		plugins/paintops/hatching/kis_hatching_preferences.cpp
M		plugins/paintops/hatching/kis_hatching_preferences.h
M		plugins/paintops/libpaintop/kis_airbrush_option.cpp
M		plugins/paintops/libpaintop/kis_airbrush_option.h
M		plugins/paintops/libpaintop/kis_bidirectional_mixing_option.cpp
M		plugins/paintops/libpaintop/kis_bidirectional_mixing_option.h
M		plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.cpp
M		plugins/paintops/libpaintop/kis_bidirectional_mixing_option_widget.h
M		plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
M		plugins/paintops/libpaintop/kis_brush_based_paintop.h
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_brush_option.cpp
M		plugins/paintops/libpaintop/kis_brush_option.h
M		plugins/paintops/libpaintop/kis_brush_option_widget.cpp
M		plugins/paintops/libpaintop/kis_brush_option_widget.h
M		plugins/paintops/libpaintop/kis_brush_selection_widget.cpp
M		plugins/paintops/libpaintop/kis_brush_selection_widget.h
M		plugins/paintops/libpaintop/kis_color_option.cpp
M		plugins/paintops/libpaintop/kis_color_option.h
M		plugins/paintops/libpaintop/kis_color_source.cpp
M		plugins/paintops/libpaintop/kis_color_source_option.cpp
M		plugins/paintops/libpaintop/kis_color_source_option.h
M		plugins/paintops/libpaintop/kis_color_source_option_widget.cpp
M		plugins/paintops/libpaintop/kis_color_source_option_widget.h
M		plugins/paintops/libpaintop/kis_compositeop_option.cpp
M		plugins/paintops/libpaintop/kis_compositeop_option.h
M		plugins/paintops/libpaintop/kis_current_outline_fetcher.cpp
M		plugins/paintops/libpaintop/kis_current_outline_fetcher.h
M		plugins/paintops/libpaintop/kis_curve_option.cpp
M		plugins/paintops/libpaintop/kis_curve_option.h
M		plugins/paintops/libpaintop/kis_curve_option_widget.cpp
M		plugins/paintops/libpaintop/kis_curve_option_widget.h
M		plugins/paintops/libpaintop/kis_dab_cache.cpp
M		plugins/paintops/libpaintop/kis_dynamic_sensor.h
M		plugins/paintops/libpaintop/kis_embedded_pattern_manager.cpp
M		plugins/paintops/libpaintop/kis_embedded_pattern_manager.h
M		plugins/paintops/libpaintop/kis_filter_option.cpp
M		plugins/paintops/libpaintop/kis_filter_option.h
M		plugins/paintops/libpaintop/kis_outline_generation_policy.h
M		plugins/paintops/libpaintop/kis_paint_action_type_option.cpp
M		plugins/paintops/libpaintop/kis_paint_action_type_option.h
M		plugins/paintops/libpaintop/kis_precision_option.cpp
M		plugins/paintops/libpaintop/kis_precision_option.h
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option.h
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option_widget.cpp
M		plugins/paintops/libpaintop/kis_pressure_flow_opacity_option_widget.h
M		plugins/paintops/libpaintop/kis_pressure_mirror_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_mirror_option.h
M		plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.cpp
M		plugins/paintops/libpaintop/kis_pressure_mirror_option_widget.h
M		plugins/paintops/libpaintop/kis_pressure_opacity_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_opacity_option.h
M		plugins/paintops/libpaintop/kis_pressure_rotation_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_rotation_option.h
M		plugins/paintops/libpaintop/kis_pressure_scatter_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_scatter_option.h
M		plugins/paintops/libpaintop/kis_pressure_scatter_option_widget.cpp
M		plugins/paintops/libpaintop/kis_pressure_scatter_option_widget.h
M		plugins/paintops/libpaintop/kis_pressure_sharpness_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_sharpness_option.h
M		plugins/paintops/libpaintop/kis_pressure_spacing_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_spacing_option.h
M		plugins/paintops/libpaintop/kis_pressure_texture_strength_option.cpp
M		plugins/paintops/libpaintop/kis_pressure_texture_strength_option.h
M		plugins/paintops/libpaintop/kis_simple_paintop_factory.h
M		plugins/paintops/libpaintop/kis_texture_option.cpp
M		plugins/paintops/libpaintop/kis_texture_option.h
M		plugins/paintops/particle/kis_particle_paintop.cpp
M		plugins/paintops/particle/kis_particle_paintop.h
M		plugins/paintops/particle/kis_particle_paintop_settings_widget.cpp
M		plugins/paintops/particle/kis_particle_paintop_settings_widget.h
M		plugins/paintops/particle/kis_particleop_option.cpp
M		plugins/paintops/particle/kis_particleop_option.h
A	(dir)	plugins/paintops/roundmarker/
A		plugins/paintops/roundmarker/CMakeLists.txt
A		plugins/paintops/roundmarker/kis_roundmarker_option.cpp
A		plugins/paintops/roundmarker/kis_roundmarker_option.h
A		plugins/paintops/roundmarker/kis_roundmarker_option.ui
A		plugins/paintops/roundmarker/kis_roundmarkerop.cpp
A		plugins/paintops/roundmarker/kis_roundmarkerop.h
A		plugins/paintops/roundmarker/kis_roundmarkerop_settings.cpp
P		plugins/paintops/roundmarker/kis_roundmarkerop_settings.h Copied from plugins/paintops/gridbrush/kis_grid_paintop_settings.h
A		plugins/paintops/roundmarker/kis_roundmarkerop_settings_widget.cpp
P		plugins/paintops/roundmarker/kis_roundmarkerop_settings_widget.h Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
A		plugins/paintops/roundmarker/krita_roundmarkerop.svg
A		plugins/paintops/roundmarker/kritaroundmarkerpaintop.json
A		plugins/paintops/roundmarker/roundmarker_paintop_plugin.cpp
P		plugins/paintops/roundmarker/roundmarker_paintop_plugin.h Copied from plugins/impex/video/tests/kis_video_plugin_test.h
M		plugins/paintops/sketch/kis_sketch_paintop.cpp
M		plugins/paintops/sketch/kis_sketch_paintop.h
M		plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
M		plugins/paintops/sketch/kis_sketch_paintop_settings.h
M		plugins/paintops/sketch/kis_sketch_paintop_settings_widget.cpp
M		plugins/paintops/sketch/kis_sketch_paintop_settings_widget.h
M		plugins/paintops/sketch/kis_sketchop_option.cpp
M		plugins/paintops/sketch/kis_sketchop_option.h
M		plugins/paintops/spray/kis_spray_paintop.cpp
M		plugins/paintops/spray/kis_spray_paintop.h
M		plugins/paintops/spray/kis_spray_paintop_settings.cpp
M		plugins/paintops/spray/kis_spray_paintop_settings.h
M		plugins/paintops/spray/kis_spray_paintop_settings_widget.cpp
M		plugins/paintops/spray/kis_spray_paintop_settings_widget.h
M		plugins/paintops/spray/kis_spray_shape_dynamics.cpp
M		plugins/paintops/spray/kis_spray_shape_dynamics.h
M		plugins/paintops/spray/kis_spray_shape_option.cpp
M		plugins/paintops/spray/kis_spray_shape_option.h
M		plugins/paintops/spray/kis_sprayop_option.cpp
M		plugins/paintops/spray/kis_sprayop_option.h
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop.cpp
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop.h
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.cpp
M		plugins/paintops/tangentnormal/kis_tangent_normal_paintop_settings_widget.h
M		plugins/paintops/tangentnormal/kis_tangent_tilt_option.cpp
M		plugins/paintops/tangentnormal/kis_tangent_tilt_option.h
M		plugins/tools/CMakeLists.txt
M		plugins/tools/basictools/strokes/move_selection_stroke_strategy.cpp
M		plugins/tools/basictools/wdgmovetool.ui
M		plugins/tools/selectiontools/kis_tool_select_similar.cc
A	(dir)	plugins/tools/tool_lazybrush/
A		plugins/tools/tool_lazybrush/CMakeLists.txt
A		plugins/tools/tool_lazybrush/kis_tool_lazy_brush.cpp
A		plugins/tools/tool_lazybrush/kis_tool_lazy_brush.h
A		plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.cpp
A		plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.h
A		plugins/tools/tool_lazybrush/kis_tool_lazy_brush_options_widget.ui
A		plugins/tools/tool_lazybrush/kritatoollazybrush.json
P		plugins/tools/tool_lazybrush/tool_lazybrush.cpp Copied from plugins/paintops/colorsmudge/kis_colorsmudgeop_settings.h
V		plugins/{tools/tool_lazybrush/tool_lazybrush.h ← impex/video/tests/kis_video_plugin_test.h}
M		plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
M		plugins/tools/tool_transform2/kis_liquify_paint_helper.h
M		plugins/tools/tool_transform2/kis_liquify_paintop.h
M		sdk/tests/empty_nodes_test.h
M		sdk/tests/qimage_based_test.h
M		sdk/tests/ui_manager_test.h

Load File

View Options

sdk/tests/ui_manager_test.h

Load File

Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown77fc478669beActions

Description

Details

Merged Changes

Changes (991)Show All Changes

Very Large Commit

R37:77fc478669be

3rdparty/ext_qt/CMakeLists.txt

3rdparty/ext_qt/gerrit-166202.diff

3rdparty/ext_qt/macdeploy-qt.diff

CMakeLists.txt

benchmarks/CMakeLists.txt

benchmarks/kis_bcontrast_benchmark.cpp

benchmarks/kis_blur_benchmark.cpp

benchmarks/kis_filter_selections_benchmark.h

benchmarks/kis_level_filter_benchmark.cpp

interfaces/KoID.h

krita/data/shaders/bilinear_gradient.frag

krita/data/shaders/conical_gradient.frag

krita/data/shaders/conical_symetric_gradient.frag

krita/data/shaders/cursor.frag

krita/data/shaders/cursor.vert

krita/data/shaders/cursor_legacy.frag

krita/data/shaders/cursor_legacy.vert

krita/data/shaders/highq_downscale.frag

krita/data/shaders/linear_gradient.frag

krita/data/shaders/matrix_transform.vert

krita/data/shaders/matrix_transform_legacy.vert

krita/data/shaders/radial_gradient.frag

krita/data/shaders/shaders.qrc

krita/data/shaders/simple_texture.frag

krita/data/shaders/simple_texture_legacy.frag

krita/data/shaders/square_gradient.frag

krita/krita.action

krita/krita.xmlgui

krita/kritamenu.action

krita/main.cc

krita/pics/layers/dark_colorizeMask.svg

krita/pics/layers/layers-icons.qrc

krita/pics/layers/light_colorizeMask.svg

krita/pics/svg/dark_showColoring.svg

krita/pics/svg/dark_showColoringOff.svg

krita/pics/svg/dark_showMarks.svg

krita/pics/svg/dark_showMarksOff.svg

krita/pics/svg/dark_updateColorize.svg

krita/pics/svg/light_showColoring.svg

krita/pics/svg/light_showColoringOff.svg

krita/pics/svg/light_showMarks.svg

krita/pics/svg/light_showMarksOff.svg

krita/pics/svg/light_updateColorize.svg

krita/pics/svg/svg-icons.qrc

krita/pics/tools/SVG/16/dark_krita_tool_lazybrush.svg

krita/pics/tools/SVG/16/light_krita_tool_lazybrush.svg

krita/pics/tools/SVG/16/tools-svg-16-icons.qrc

libs/brush/kis_imagepipe_brush.h

libs/flake/KoPatternBackground.cpp

libs/flake/KoShapeRegistry.h

libs/global/kis_dom_utils.h

libs/image/CMakeLists.txt

libs/image/brushengine/kis_combo_based_paintop_property.cpp

libs/image/brushengine/kis_combo_based_paintop_property.h

libs/image/brushengine/kis_locked_properties.cc

libs/image/brushengine/kis_locked_properties.h

libs/image/brushengine/kis_locked_properties_proxy.cpp

libs/image/brushengine/kis_locked_properties_proxy.h

libs/image/brushengine/kis_locked_properties_server.cpp

libs/image/brushengine/kis_locked_properties_server.h

libs/image/brushengine/kis_paintop.cc

libs/image/brushengine/kis_paintop_config_widget.cpp

libs/image/brushengine/kis_paintop_config_widget.h

libs/image/brushengine/kis_paintop_settings.cpp

libs/image/brushengine/kis_paintop_settings.h

libs/image/brushengine/kis_paintop_utils.h

libs/image/brushengine/kis_slider_based_paintop_property.cpp

libs/image/brushengine/kis_slider_based_paintop_property.h

libs/image/brushengine/kis_uniform_paintop_property.cpp

libs/image/brushengine/kis_uniform_paintop_property.h

libs/image/commands/kis_change_filter_command.h

libs/image/commands_new/kis_image_set_resolution_command.cpp

libs/image/filter/kis_color_transformation_configuration.cc

Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown
77fc478669be
Actions

Changes (991)
Show All Changes