Diffusion Krita 7032486b482c

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

Authored by rempt on Aug 2 2018, 8:54 AM.

Description

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

Details

Committed

rempt

Aug 2 2018, 8:54 AM

Parents

R37:6a737a98957a: Fixed SegFault in LibKis Node mergeDown
R37:14ac39916c9e: Merge branch 'master' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

rempt committed R37:7032486b482c: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Aug 2 2018, 8:54 AM

Merged Changes

Commit	Author	Details	Committed
6a737a98957a	emmetoneill	Fixed SegFault in LibKis Node mergeDown	Aug 2 2018
6a95ce1589e1	rempt	Revert "Update kis_iterators_ng_test"	Aug 1 2018
d82d01d2d5be	rempt	Revert "Update kis_iterator_test"	Aug 1 2018
c6c25433943e	rempt	Make the onion skin compositor test not crash	Aug 1 2018
f596695af646	rempt	Fix the crash in the cage transform worker test	Aug 1 2018
367201b33280	rempt	Fix the histogram test	Aug 1 2018
708622bbf6e9	rempt	Remove the Blur.cfg file.	Aug 1 2018
4d0ecd5f9990	lieroz	Merge branch 'master' of git://anongit.kde.org/krita	Jul 31 2018
10996d6fa5bd	lieroz	Fixed kis_tiled_data_manager_test.	Jul 31 2018
f6b2342bf54e	rempt	"Fix" the jpeg unittest	Jul 31 2018
df20641705b4	lieroz	Merge branch 'akamakin/tile-manager-bug-fixes'	Jul 31 2018
5b220a44fd5e	lieroz	Fixed problems with invalid extent.	Jul 31 2018
e4e21bb9c8aa	rempt	Create vector selections and layers are created with a KoShapeControllerBase	Jul 31 2018
d3c98d12db61	rempt	Fix the xcf test; masks should not be added twice to the image	Jul 31 2018
e34072c6a5f3	rempt	Fix the exr test	Jul 31 2018
b0ebb62fca65	rempt	debug--	Jul 31 2018
02dc94c5aeaf	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 31 2018
0b94a5f0ba25	vanyossi	Small refactor of mask similarity test to avoid repetition	Jul 31 2018
d4aaf03c18dd	vanyossi	Remove unused code from similarity test	Jul 31 2018
eeec7a970f88	dkazakov	Add an assert to KisAutoContrast	Jul 30 2018
762a9a647942	lieroz	Merge branch 'akamakin/tile-manager-bug-fixes'	Jul 30 2018
858dd2c6b471	lieroz	Fixed low memory tests.	Jul 30 2018
4d9161fabf72	lieroz	Fixed tests.	Jul 29 2018
3c60a5465e13	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 29 2018
2214913774b3	l10n daemon script	GIT_SILENT made messages (after extraction)	Jul 29 2018
796fc2ee593b	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 28 2018
a87835636c36	rempt	Add a hidden config option to lock all dockers in place	Jul 28 2018
ff83ebb73821	vanyossi	Reduce difference gap of Default Rect Mask Vector impl	Jul 28 2018
02ee809cdbf7	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 27 2018
9b87dc25a773	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 26 2018
e42aaaafaafb	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 26 2018
da249312e649	vanyossi	Implement Vc Optimization for Default Rect Mask	Jul 26 2018
728cec98fba8	vanyossi	Adjust Spacing of auto_soft_rect.kpp test preset to be 0.1	Jul 24 2018
0a7d9b113791	vanyossi	Add Default Rectangular to FreehandStrokeBenchmark	Jul 24 2018
e9bd996ec774	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 24 2018
e82a64687a60	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 20 2018
ebdd1921566c	vanyossi	Merge branch 'master' into ivany/T8580-Brush-AVX-Optim	Jul 12 2018
21afc59cea14	vanyossi	Use Vc Indexes instead of custom SimdArray for integer casting	Jul 12 2018
b8f2080917a3	vanyossi	Reduce casting on Vector Indexes creation	Jul 7 2018
2565a74bdc9c	vanyossi	Vectorize Soft Rect Mask Generator	Jul 6 2018

Changes (150)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/data/templates/comics/BD-EuroTemplate.desktop
	M			krita/data/templates/comics/Comics-USTemplate.desktop
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/comics/a4_waffle_grid.desktop
	M			krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/web_design.desktop
	M			krita/data/templates/texture/.directory
	M			krita/data/templates/texture/Texture1024x10248bitsrgb.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture1k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture2048x20488bitsrgb.desktop
	M			krita/data/templates/texture/Texture256x2568bitsrgb.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture4096x40968bitsrgb.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture512x5128bitsrgb.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k8bitsrgb.desktop
	M			krita/org.kde.krita.appdata.xml
	M			krita/org.kde.krita.desktop
	M			libs/flake/CMakeLists.txt
	M			libs/flake/KoCanvasBase.cpp
	M			libs/flake/KoCanvasBase.h
	M			libs/flake/KoDataCenterBase.h
	V			libs/flake/{KoShapeBasedDocumentBase.cpp → KoShapeControllerBase.cpp}
	V			libs/flake/{KoShapeBasedDocumentBase.h → KoShapeControllerBase.h}
	M			libs/flake/KoShapeController.cpp
	M			libs/flake/KoShapeController.h
	V			libs/flake/{KoShapeControllerBase.cpp ← KoShapeBasedDocumentBase.cpp}
	V			libs/flake/{KoShapeControllerBase.h ← KoShapeBasedDocumentBase.h}
	M			libs/flake/KoShapeLoadingContext.cpp
	M			libs/flake/KoShapeLoadingContext.h
	M			libs/flake/KoToolBase.cpp
	M			libs/flake/KoToolBase.h
	M			libs/flake/KoToolManager.h
	M			libs/flake/commands/KoMultiPathPointJoinCommand.cpp
	M			libs/flake/commands/KoMultiPathPointJoinCommand.h
	M			libs/flake/commands/KoMultiPathPointMergeCommand.cpp
	M			libs/flake/commands/KoMultiPathPointMergeCommand.h
	M			libs/flake/commands/KoPathCombineCommand.cpp
	M			libs/flake/commands/KoPathCombineCommand.h
	M			libs/flake/commands/KoShapeClipCommand.cpp
	M			libs/flake/commands/KoShapeClipCommand.h
	M			libs/flake/commands/KoShapeCreateCommand.cpp
	M			libs/flake/commands/KoShapeCreateCommand.h
	M			libs/flake/commands/KoShapeDeleteCommand.cpp
	M			libs/flake/commands/KoShapeDeleteCommand.h
	M			libs/flake/commands/KoShapeUnclipCommand.cpp
	M			libs/flake/commands/KoShapeUnclipCommand.h
	M			libs/flake/tests/MockShapes.h
	M			libs/flake/tests/TestSnapStrategy.cpp
	M			libs/image/kis_brush_mask_applicator_factories.cpp
	M			libs/image/kis_curve_rect_mask_generator.cpp
	M			libs/image/kis_curve_rect_mask_generator.h
	A			libs/image/kis_curve_rect_mask_generator_p.h
	M			libs/image/kis_rect_mask_generator.cpp
	M			libs/image/kis_rect_mask_generator.h
	A			libs/image/kis_rect_mask_generator_p.h
	M			libs/image/metadata/kis_meta_data_schema_registry.cc
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/KisMaskGeneratorBenchmark.cpp
	M			libs/image/tests/KisMaskGeneratorBenchmark.h
	M			libs/image/tests/kis_cage_transform_worker_test.cpp
	M			libs/image/tests/kis_histogram_test.cpp
	M			libs/image/tests/kis_iterator_test.cpp
	M			libs/image/tests/kis_iterators_ng_test.cpp
	M			libs/image/tests/kis_mask_similarity_test.cpp
	M			libs/image/tests/kis_mask_similarity_test.h
	M			libs/image/tests/kis_onion_skin_compositor_test.cpp
	M			libs/image/tiles3/KisTiledExtentManager.cpp
	M			libs/image/tiles3/kis_tile_data_store.cc
	M			libs/image/tiles3/kis_tile_hash_table2.h
	M			libs/image/tiles3/tests/kis_tiled_data_manager_test.cpp
	M			libs/libkis/Node.cpp
	M			libs/libkis/Node.h
	M			libs/libkis/VectorLayer.cpp
	M			libs/libkis/VectorLayer.h
	M			libs/libqml/plugins/kritasketchplugin/models/LayerModel.cpp
	M			libs/pigment/KoBasicHistogramProducers.h
	M			libs/pigment/KoHistogramProducer.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisDocument.h
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/canvas/kis_canvas2.cpp
	M			libs/ui/canvas/kis_canvas2.h
	M			libs/ui/flake/KisReferenceImagesLayer.cpp
	M			libs/ui/flake/KisReferenceImagesLayer.h
	M			libs/ui/flake/kis_shape_controller.cpp
	M			libs/ui/flake/kis_shape_controller.h
	M			libs/ui/flake/kis_shape_layer.cc
	M			libs/ui/flake/kis_shape_layer.h
	M			libs/ui/flake/kis_shape_selection.cpp
	M			libs/ui/flake/kis_shape_selection.h
	M			libs/ui/flake/kis_shape_selection_canvas.cpp
	M			libs/ui/flake/kis_shape_selection_canvas.h
	M			libs/ui/tests/FreehandStrokeBenchmark.cpp
	M			libs/ui/tests/FreehandStrokeBenchmark.h
	A			libs/ui/tests/data/testing_1000px_auto_rectangular.kpp
	A			libs/ui/tests/data/testing_1000px_auto_soft_rect.kpp
	M			libs/ui/tests/kis_shape_selection_test.cpp
	M			libs/ui/tests/util.h
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/filters/colorsfilters/colorsfilters.cpp
	D			plugins/filters/tests/data/Blur.cfg
	M			plugins/flake/textshape/TextTool.cpp
	M			plugins/flake/textshape/kotext/commands/AddAnnotationCommand.cpp
	M			plugins/impex/csv/tests/CMakeLists.txt
	M			plugins/impex/exr/exr_export.cc
	M			plugins/impex/exr/tests/CMakeLists.txt
	M			plugins/impex/exr/tests/data/results/memorial.exr.png
	M			plugins/impex/exr/tests/kis_exr_test.cpp
	M			plugins/impex/heightmap/tests/CMakeLists.txt
	M			plugins/impex/jpeg/tests/CMakeLists.txt
	M			plugins/impex/jpeg/tests/kis_jpeg_test.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.cpp
	M			plugins/impex/libkra/kis_kra_load_visitor.h
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/tests/kis_kra_saver_test.cpp
	M			plugins/impex/libkra/tests/util.h
	M			plugins/impex/png/tests/CMakeLists.txt
	M			plugins/impex/ppm/tests/CMakeLists.txt
	M			plugins/impex/svg/kis_svg_import.cc
	M			plugins/impex/xcf/kis_xcf_import.cpp
	M			plugins/impex/xcf/tests/CMakeLists.txt
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/exportlayers/kritapykrita_exportlayers.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/scripter/kritapykrita_scripter.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop
	M			sdk/tests/filestest.h