Diffusion Krita 02ee809cdbf7

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

Authored by vanyossi on Jul 27 2018, 3:48 AM.

Description

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

Details

Committed

vanyossi

Jul 27 2018, 3:48 AM

Parents

R37:9b87dc25a773: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim
R37:49fc059e6c41: Fix blur.cfg -> Blur.cfg change on case insensitive OSX

Branches

Unknown

Tags

Unknown

vanyossi committed R37:02ee809cdbf7: Merge branch 'master' into ivany/T8580-Brush-AVX-Optim (authored by vanyossi).Jul 27 2018, 3:48 AM

Merged Changes

Commit	Author	Details	Committed
49fc059e6c41	vanyossi	Fix blur.cfg -> Blur.cfg change on case insensitive OSX	Jul 27 2018
347a78dcb8f2	dkazakov	Fix KisDerivedResourcesTest	Jul 26 2018
09a1cc8ed2f4	dkazakov	[bugfix] Connect KisPaintOpBox to the resource manager in constructor	Jul 26 2018
232df0a4c801	rempt	Fix KoResourceTaggingTest	Jul 26 2018
87d07ec5e1d8	rempt	Remove duplicates	Jul 26 2018
fc23e986b106	rempt	Only look in the toplevel folder if there are no aliases	Jul 26 2018
3b76cd505a5c	rempt	Add the type we're trying to load to the warning about failed resource loads	Jul 26 2018
5ab1a3d141d1	rempt	Remove superfluous Q_ASSERT	Jul 26 2018
6ae5c55481bd	rempt	Only look for .input files, not everything	Jul 26 2018
d920d1d3b565	rempt	Fix KisExiv2Test with KISTEST_MAIN	Jul 26 2018
387c9fdb89f1	rempt	Move tests that need kritaui to libs/ui/tests	Jul 26 2018

Changes (42)

				Path	Packages
	M			libs/flake/KoDerivedResourceConverter.cpp
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/kis_async_merger_test.cpp
	V			libs/{image → ui}/tests/kis_cs_conversion_test.cpp
	V			libs/{image → ui}/tests/kis_cs_conversion_test.h
	V			libs/{image → ui}/tests/kis_dom_utils_test.cpp
	V			libs/{image → ui}/tests/kis_dom_utils_test.h
	V			libs/{image → ui}/tests/kis_image_animation_interface_test.cpp
	V			libs/{image → ui}/tests/kis_image_animation_interface_test.h
	V			libs/{image → ui}/tests/kis_onion_skin_compositor_test.cpp
	V			libs/{image → ui}/tests/kis_onion_skin_compositor_test.h
	V			libs/{image → ui}/tests/kis_perspective_transform_worker_test.cpp
	V			libs/{image → ui}/tests/kis_perspective_transform_worker_test.h
	V			libs/{image → ui}/tests/kis_processings_test.cpp
	V			libs/{image → ui}/tests/kis_processings_test.h
	V			libs/{image → ui}/tests/kis_transform_worker_test.cpp
	V			libs/{image → ui}/tests/kis_transform_worker_test.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/input/kis_input_profile_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/tests/CMakeLists.txt
	V			libs/{ui ← image}/tests/kis_cs_conversion_test.cpp
	V			libs/{ui ← image}/tests/kis_cs_conversion_test.h
	M			libs/ui/tests/kis_derived_resources_test.cpp
	V			libs/{ui ← image}/tests/kis_dom_utils_test.cpp
	V			libs/{ui ← image}/tests/kis_dom_utils_test.h
	M			libs/ui/tests/kis_exiv2_test.cpp
	V			libs/{ui ← image}/tests/kis_image_animation_interface_test.cpp
	V			libs/{ui ← image}/tests/kis_image_animation_interface_test.h
	V			libs/{ui ← image}/tests/kis_onion_skin_compositor_test.cpp
	V			libs/{ui ← image}/tests/kis_onion_skin_compositor_test.h
	V			libs/{ui ← image}/tests/kis_perspective_transform_worker_test.cpp
	V			libs/{ui ← image}/tests/kis_perspective_transform_worker_test.h
	V			libs/{ui ← image}/tests/kis_processings_test.cpp
	V			libs/{ui ← image}/tests/kis_processings_test.h
	V			libs/{ui ← image}/tests/kis_transform_worker_test.cpp
	V			libs/{ui ← image}/tests/kis_transform_worker_test.h
	M			libs/widgets/KisDlgInternalColorSelector.cpp
	M			libs/widgets/KoResourceServer.h
	M			libs/widgets/tests/KoResourceTaggingTest.cpp
	M			libs/widgetutils/KoResourcePaths.cpp
	D			plugins/filters/tests/data/blur.cfg