Diffusion Krita 141fd8b2e7f1

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

Authored by rempt on Jul 17 2018, 1:48 PM.

Description

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

Details

Committed

rempt

Jul 17 2018, 1:48 PM

Parents

R37:766c7567a1d5: Add a link to our how-to-report-a-bug manual
R37:e9c85e7d3879: Add a link to our how-to-report-a-bug manual

Branches

Unknown

Tags

Unknown

rempt committed R37:141fd8b2e7f1: Merge remote-tracking branch 'origin' into rempt/T379-resource-management (authored by rempt).Jul 17 2018, 1:48 PM

Merged Changes

Commit	Author	Details	Committed
766c7567a1d5	rempt	Add a link to our how-to-report-a-bug manual	Jul 17 2018
ba4f419b30e4	rempt	Try to fix the version string for sip once more	Jul 17 2018
18b9b33d0b2f	jounip	Reduce aliasing in reference images	Jul 17 2018
eb5d9f4d284c	victorw	Replace i18n() with ki18n() in kis_filter_category_ids.cpp to ensure strings…	Jul 17 2018
7dc40cbc358d	victorw	Remove unused FiltersCategoryNonPhotorealisticId	Jul 17 2018
08968e7b66ea	victorw	Extracted filter category KoIDs to a separate file	Jul 17 2018
55fcc4d4843c	rempt	Add #if QT_VERSION >= 0x050900 to the include for QOperatingSystemVersion	Jul 17 2018
024d1a36eb8b	rempt	Fix KMainWindow saving incorrect widget settings	Jul 17 2018

Changes (46)

				Path	Packages
	M			libs/brush/kis_qimage_pyramid.cpp
	M			libs/brush/kis_qimage_pyramid.h
	M			libs/image/CMakeLists.txt
	M			libs/image/filter/kis_filter.cc
	M			libs/image/filter/kis_filter.h
	P			libs/image/filter/kis_filter_category_ids.cpp Copied from plugins/flake/textshape/kotext/commands/InsertDeleteChangesCommand.cpp
	P			libs/image/filter/kis_filter_category_ids.h Copied from plugins/flake/textshape/kotext/commands/InsertDeleteChangesCommand.cpp
	M			libs/ui/KisReferenceImage.cpp
	M			plugins/filters/asccdl/kis_asccdl_filter.cpp
	M			plugins/filters/blur/kis_blur_filter.cpp
	M			plugins/filters/blur/kis_gaussian_blur_filter.cpp
	M			plugins/filters/blur/kis_lens_blur_filter.cpp
	M			plugins/filters/blur/kis_motion_blur_filter.cpp
	M			plugins/filters/colors/kis_color_to_alpha.cpp
	M			plugins/filters/colors/kis_minmax_filters.cpp
	M			plugins/filters/colorsfilters/colorsfilters.cpp
	M			plugins/filters/colorsfilters/kis_color_balance_filter.cpp
	M			plugins/filters/colorsfilters/kis_desaturate_filter.cpp
	M			plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
	M			plugins/filters/colorsfilters/kis_multichannel_filter_base.cpp
	M			plugins/filters/convertheightnormalmap/kis_convert_height_to_normal_map_filter.cpp
	M			plugins/filters/convolutionfilters/convolutionfilters.cpp
	M			plugins/filters/dodgeburn/DodgeBurn.cpp
	M			plugins/filters/edgedetection/kis_edge_detection_filter.cpp
	M			plugins/filters/embossfilter/kis_emboss_filter.cpp
	M			plugins/filters/example/example.cpp
	M			plugins/filters/fastcolortransfer/fastcolortransfer.cpp
	M			plugins/filters/gradientmap/krita_filter_gradient_map.cpp
	M			plugins/filters/halftone/kis_halftone_filter.cpp
	M			plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
	M			plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
	M			plugins/filters/indexcolors/indexcolors.cpp
	M			plugins/filters/levelfilter/kis_level_filter.cpp
	M			plugins/filters/noisefilter/noisefilter.cpp
	M			plugins/filters/normalize/kis_normalize.cpp
	M			plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
	M			plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp
	M			plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
	M			plugins/filters/posterize/posterize.cpp
	M			plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
	M			plugins/filters/randompickfilter/randompickfilter.cpp
	M			plugins/filters/roundcorners/kis_round_corners_filter.cpp
	M			plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
	M			plugins/filters/threshold/threshold.cpp
	M			plugins/filters/unsharp/kis_unsharp_filter.cpp
	M			plugins/filters/wavefilter/wavefilter.cpp