Diffusion Krita 0eee33995a4c

Merge branch 'master' into krita-testing-wolthera
0eee33995a4c
Actions

Authored by woltherav on Aug 15 2016, 3:05 PM.

Description

Merge branch 'master' into krita-testing-wolthera

Details

Committed

woltherav

Aug 15 2016, 3:05 PM

Parents

R37:0c201bc0b79c: Initial implementation displayrenderer
R37:d07cdb6338e5: Fix Color Sliders to update on Exposure change

Branches

Unknown

Tags

Unknown

woltherav committed R37:0eee33995a4c: Merge branch 'master' into krita-testing-wolthera (authored by woltherav).Aug 15 2016, 3:05 PM

woltherav mentioned this in R37:93ef7c8ef97e: Merge in new internal color picker dialog!.Sep 6 2016, 2:50 PM

Merged Changes

Commit		Author	Details	Committed
d07cdb6338e5		dkazakov	Fix Color Sliders to update on Exposure change	Aug 15 2016
8578f36af4b5		dkazakov	Update specific color selector when Exposure changes	Aug 15 2016
556ae6759b08		rempt	Remove spurious semicolon	Aug 15 2016
b5a3ad708083		rempt	BUG:366349 Fix the label for the reset canvas rotation action	Aug 15 2016
b61e34650825		rempt	BUG:366758 Fix confusion between canvas mirroring and mirrored painting	Aug 15 2016
fa0a9b592a21		dkazakov	Fix Instant Preview + Mirror Mode	Aug 15 2016
b8c76c425fdf		dkazakov	Fix one more range slider not to become 0	Aug 15 2016
5cf22427beab		dkazakov	Fix Instant Preview in Spray brushes	Aug 15 2016
4b1e316e2450		dkazakov	Fix loading existing Spray brush presets	Aug 15 2016
0ff3ffe2feff		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Aug 15 2016
6e5639b4d6ac	D2429	dkazakov	Wavelet decompose logical fix	Aug 15 2016
5335d3f0f5c4		l10n daemon script	SVN_SILENT made messages (after extraction)	Aug 15 2016
82247dd5d276		scottpetrovic	order the bit depths correctly for color spaces	Aug 13 2016
3480a5f3b863		langkamp	Fix convert layer to Paint layer logic. If it's a group layer or a layer with…	Aug 13 2016

Changes (43)

				Path	Packages
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.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/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
	M			krita/kritamenu.action
	M			krita/org.kde.krita.appdata.xml
	M			libs/image/brushengine/kis_random_source.cpp
	M			libs/image/brushengine/kis_random_source.h
	M			libs/image/kis_painter.cc
	M			libs/ui/KisView.cpp
	M			libs/ui/KisView.h
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/canvas/kis_coordinates_converter.cpp
	M			libs/ui/canvas/kis_coordinates_converter.h
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/kis_canvas_resource_provider.h
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_mirror_manager.cpp
	M			libs/ui/kis_mirror_manager.h
	M			libs/ui/tests/kis_coordinates_converter_test.cpp
	M			libs/ui/tool/kis_selection_tool_config_widget_helper.h
	M			libs/ui/widgets/kis_color_space_selector.cc
	M			libs/ui/widgets/kis_color_space_selector.h
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/dockers/colorslider/kis_color_slider_dock.cpp
	M			plugins/dockers/colorslider/kis_color_slider_dock.h
	M			plugins/dockers/specificcolorselector/kis_specific_color_selector_widget.cc
	M			plugins/dockers/specificcolorselector/kis_specific_color_selector_widget.h
	M			plugins/dockers/specificcolorselector/specificcolorselector_dock.cc
	M			plugins/dockers/specificcolorselector/specificcolorselector_dock.h
	M			plugins/extensions/waveletdecompose/waveletdecompose.cpp
	M			plugins/impex/exr/krita_exr.desktop
	M			plugins/paintops/gridbrush/CMakeLists.txt
	D			plugins/paintops/gridbrush/random_gauss.cpp
	D			plugins/paintops/gridbrush/random_gauss.h
	M			plugins/paintops/spray/CMakeLists.txt
	M			plugins/paintops/spray/kis_sprayop_option.cpp
	D			plugins/paintops/spray/random_gauss.cpp
	D			plugins/paintops/spray/random_gauss.h
	M			plugins/paintops/spray/spray_brush.cpp
	M			plugins/paintops/spray/spray_brush.h