Diffusion Krita a8182ef76b20

Merge remote-tracking branch 'origin' into rempt/T379-resource-management
a8182ef76b20
Actions

Authored by rempt on Aug 22 2018, 10:16 AM.

Description

Merge remote-tracking branch 'origin' into rempt/T379-resource-management

Details

Committed

rempt

Aug 22 2018, 10:16 AM

Parents

R37:10c4926224a4: Remove the standalone scratchpad
R37:3f6f2d47468f: Merge remote-tracking branch 'origin' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

rempt committed R37:a8182ef76b20: Merge remote-tracking branch 'origin' into rempt/T379-resource-management (authored by rempt).Aug 22 2018, 10:16 AM

Merged Changes

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

Commit	Author	Details	Committed
10c4926224a4	rempt	Remove the standalone scratchpad	Aug 21 2018
7f53030ba312	rempt	Re-add the kis_categories_mapper_test	Aug 21 2018
87a0213451d3	rempt	Make kis_animation_importer_test a KISTEST_MAIN test	Aug 21 2018
183198242f69	rempt	KisZoomAndPanTest: make it into a KISTEST_MAIN test	Aug 21 2018
0472fc822fef	rempt	Do some work on KisShapeControllerTest	Aug 21 2018
7d74d7bbfe39	rempt	Make this test a KISTEST_MAIN test	Aug 21 2018
d59a900c30b6	rempt	Re-enable kis_node_model_test	Aug 21 2018
be2aa84f008b	rempt	Re-enable kis_asl_layer_style_serializer_test	Aug 21 2018
ca42f6b39f4c	rempt	Re-add FillProcessingVisitorTest	Aug 21 2018
604f74249306	rempt	Re-add the kis_prescaled_projection_test	Aug 21 2018
da580972e6f4	rempt	Only two libs/image tests remain broken	Aug 21 2018
acc3b63672d0	rempt	Limit the number of runs with LIMIT_LONG_TESTS	Aug 21 2018
0d21ccc9aa05	rempt	Add extra debug; maybe that will help finding the error on jenkins	Aug 21 2018
2246019423e9	rempt	Fix the KisUpdaterContextTest	Aug 21 2018
e7ddf3c9a46d	rempt	Assert if there's no leaf	Aug 21 2018
bb92265f455a	dkazakov	Implement different types of Select Opaque action	Aug 21 2018
620e09f6b301	rempt	Fix build	Aug 21 2018
afea4d7d3126	rempt	Add brackets to make code clearer	Aug 21 2018
e6a51131bcd8	rempt	Re-enable kis_tile_data_pooler_test	Aug 21 2018
7659df51b909	rempt	Move two tests that do not fail out of the broken tests block	Aug 21 2018
27e633817c1b	rempt	Re-enable the kis_store_limits_test	Aug 21 2018
5f91ca06733d	rempt	Re-enable the kis_image_animation_interface_test test	Aug 21 2018
c3d46570dd87	rempt	Re-add kis_queues_progress_updater_test to the unittests	Aug 21 2018
32c5e09c5c58	rempt	Make this a KISTEST_MAIN test	Aug 21 2018
72298831c386	rempt	Override debug rules with QLoggingCategory	Aug 21 2018
6057b4830e39	rempt	Re-enable the kis_paint_device_test	Aug 21 2018
421b59e216a9	dkazakov	Make color difference threshold for color labels higher	Aug 21 2018
c84112f55ce2	scottpetrovic	Add ability to change thumbnail size on layers docker	Aug 20 2018
5e2a52d78d1e	dkazakov	Do not create extra mask if the user has a deactivated selection mask already	Aug 20 2018
399a4b74a452	dkazakov	Make default selection overlay color more transparent	Aug 20 2018
085cc05bad81	rempt	Add missing override	Aug 20 2018
1d83abb567c0	rempt	Add missing override	Aug 20 2018
66ea1a05f237	rempt	Add missing override	Aug 20 2018
f6dac66c35a0	rempt	Add missing override	Aug 20 2018
2103aa71d7b0	rempt	Fix warnings: unused variables	Aug 20 2018
b44ee421d7c5	rempt	Fix warnings: unused variables	Aug 20 2018
bdd2fe1fd9f7	rempt	Add missing override	Aug 20 2018
d55dd6631335	rempt	Fix warning: struct/class confusion	Aug 20 2018
f556c758fcc6	rempt	Fix warning: struct/class confusion	Aug 20 2018
b8047951707f	rempt	Fix warnings: unused variables	Aug 20 2018
1d437ec383ba	rempt	Fix warning: missing override	Aug 20 2018
afa17f8a8c26	rempt	Fix warning: struct/class confusion	Aug 20 2018
da361d0229d4	rempt	Fix warning: struct/class confusion	Aug 20 2018
84a25d4c224b	rempt	Fix warnings: unused variables	Aug 20 2018
99b49904ae89	rempt	Fix warnings: unused variables	Aug 20 2018
e18f510f6617	rempt	Fix warnings: unused variables	Aug 20 2018
045447aa0332	rempt	Fix warnings: unused variables	Aug 20 2018
24ff4fea5caa	rempt	Fix warnings: unused variables	Aug 20 2018
7f5ecb1f1918	rempt	Fix warning: unused variables	Aug 20 2018
1a3368fef01f	rempt	Fix warning: unused variable	Aug 20 2018

Changes (119)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			krita/krita.action
	M			krita/krita4.xmlgui
	M			krita/kritamenu.action
	M			libs/flake/KoBakedShapeRenderer.h
	M			libs/flake/KoColorBackground.cpp
	M			libs/flake/KoPathShape.cpp
	M			libs/flake/KoSelection.cpp
	M			libs/flake/KoShape.cpp
	M			libs/flake/KoShapeContainer.cpp
	M			libs/flake/commands/KoPathShapeMarkerCommand.cpp
	M			libs/flake/commands/KoShapeResizeCommand.h
	M			libs/flake/svg/SvgParser.h
	M			libs/flake/text/KoSvgTextChunkShape.cpp
	M			libs/flake/text/KoSvgTextChunkShape_p.h
	M			libs/flake/text/KoSvgTextShape.cpp
	M			libs/flake/tools/KoPathTool.cpp
	M			libs/flake/tools/KoPathToolSelection.h
	M			libs/image/CMakeLists.txt
	A			libs/image/KisLazyStorage.h
	A			libs/image/KisSelectionUpdateCompressor.cpp
	P			libs/image/KisSelectionUpdateCompressor.h Copied from libs/ui/tests/kis_node_model_test.h
	M			libs/image/brushengine/kis_paintop_utils.h
	M			libs/image/kis_async_merger.cpp
	M			libs/image/kis_base_rects_walker.h
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/kis_layer_utils.h
	M			libs/image/kis_mask.cc
	M			libs/image/kis_mask.h
	M			libs/image/kis_painter.h
	M			libs/image/kis_projection_leaf.cpp
	M			libs/image/kis_projection_leaf.h
	M			libs/image/kis_raster_keyframe_channel.cpp
	M			libs/image/kis_selection.cc
	M			libs/image/kis_selection.h
	M			libs/image/kis_selection_mask.cpp
	M			libs/image/kis_selection_mask.h
	M			libs/image/kis_update_job_item.h
	M			libs/image/kis_update_scheduler.cpp
	M			libs/image/kis_update_scheduler.h
	M			libs/image/kis_update_selection_job.cpp
	M			libs/image/kis_updater_context.cpp
	M			libs/image/kis_updater_context.h
	M			libs/image/krita_utils.h
	M			libs/image/lazybrush/kis_colorize_mask.h
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/kis_async_merger_test.cpp
	M			libs/image/tests/kis_image_animation_interface_test.cpp
	M			libs/image/tests/kis_paint_device_test.cpp
	M			libs/image/tests/kis_queues_progress_updater_test.cpp
	M			libs/image/tests/kis_update_scheduler_test.cpp
	M			libs/image/tests/kis_updater_context_test.cpp
	M			libs/image/tiles3/kis_tile_hash_table2.h
	M			libs/image/tiles3/swap/kis_tile_data_swapper_p.h
	M			libs/image/tiles3/tests/CMakeLists.txt
	M			libs/image/tiles3/tests/kis_store_limits_test.cpp
	M			libs/image/tiles3/tests/kis_tile_data_pooler_test.cpp
	M			libs/libkis/tests/TestChannel.cpp
	M			libs/ui/KisMultiFeedRSSModel.h
	M			libs/ui/KisNodeDelegate.cpp
	M			libs/ui/KisNodeView.cpp
	M			libs/ui/actions/kis_selection_action_factories.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.h
	M			libs/ui/flake/kis_shape_selection_model.cpp
	M			libs/ui/flake/kis_shape_selection_model.h
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_node_view_color_scheme.cpp
	M			libs/ui/tests/CMakeLists.txt
	M			libs/ui/tests/fill_processing_visitor_test.cpp
	M			libs/ui/tests/freehand_stroke_test.cpp
	M			libs/ui/tests/kis_animation_importer_test.cpp
	M			libs/ui/tests/kis_asl_layer_style_serializer_test.cpp
	M			libs/ui/tests/kis_categories_mapper_test.h
	M			libs/ui/tests/kis_dummies_facade_base_test.cpp
	M			libs/ui/tests/kis_dummies_facade_base_test.h
	P			libs/ui/tests/kis_node_model_test.h Copied to libs/image/KisSelectionUpdateCompressor.h
	M			libs/ui/tests/kis_prescaled_projection_test.cpp
	M			libs/ui/tests/kis_shape_controller_test.cpp
	M			libs/ui/tests/kis_shape_controller_test.h
	M			libs/ui/tests/kis_zoom_and_pan_test.cpp
	D			libs/ui/tests/scratchpad
	D			libs/ui/tests/scratchpad/CMakeLists.txt
	D			libs/ui/tests/scratchpad/scratchpad.cpp
	M			libs/ui/tool/kis_tool_shape.cc
	M			libs/ui/tool/kis_tool_shape.h
	M			libs/ui/utils/kis_document_aware_spin_box_unit_manager.h
	M			libs/widgets/KisDlgInternalColorSelector.h
	M			libs/widgets/KoToolBoxDocker_p.h
	M			libs/widgetutils/KoFileDialog.cpp
	M			libs/widgetutils/config/krecentfilesaction.cpp
	M			plugins/assistants/Assistants/ConcentricEllipseAssistant.h
	M			plugins/assistants/Assistants/EllipseAssistant.h
	M			plugins/assistants/Assistants/FisheyePointAssistant.h
	M			plugins/assistants/Assistants/InfiniteRulerAssistant.h
	M			plugins/assistants/Assistants/ParallelRulerAssistant.h
	M			plugins/assistants/Assistants/PerspectiveAssistant.h
	M			plugins/assistants/Assistants/RulerAssistant.h
	M			plugins/assistants/Assistants/SplineAssistant.h
	M			plugins/assistants/Assistants/VanishingPointAssistant.h
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/dockers/defaultdockers/kis_layer_box.h
	M			plugins/dockers/defaultdockers/wdglayerbox.ui
	M			plugins/extensions/colorrange/colorrange.cc
	M			plugins/extensions/colorrange/colorrange.h
	M			plugins/flake/artistictextshape/ArtisticTextShape.h
	M			plugins/paintops/defaultpaintops/brush/KisDabRenderingExecutor.h
	M			plugins/paintops/defaultpaintops/brush/KisDabRenderingQueue.h
	M			plugins/paintops/defaultpaintops/brush/kis_brushop.h
	M			plugins/tools/basictools/kis_tool_ellipse.cc
	M			plugins/tools/basictools/kis_tool_line.cc
	M			plugins/tools/basictools/kis_tool_rectangle.cc
	M			plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
	M			plugins/tools/defaulttool/defaulttool/ShapeRotateStrategy.cpp
	M			plugins/tools/tool_polygon/kis_tool_polygon.cc
	M			plugins/tools/tool_polyline/kis_tool_polyline.cc
	M			sdk/tests/kistest.h