Diffusion Krita 99feb3b81232

Merge branch 'master' into krita-testing-wolthera
99feb3b81232
Actions

Authored by woltherav on Aug 10 2016, 2:09 PM.

Description

Merge branch 'master' into krita-testing-wolthera

Details

Committed

woltherav

Aug 10 2016, 2:09 PM

Parents

R37:6f18c4c3272a: Make internal color selector dialog possible to do modal mode.
R37:92c253ac0ac1: Trying to fix my bad Move Tool patch.

Branches

Unknown

Tags

Unknown

woltherav committed R37:99feb3b81232: Merge branch 'master' into krita-testing-wolthera (authored by woltherav).Aug 10 2016, 2:09 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
92c253ac0ac1	D2362	tantsevov/dkazakov	Trying to fix my bad Move Tool patch.	Aug 10 2016
3ef661a7911d		rempt	BUG:363019 Fix loading images with uppercase suffix	Aug 8 2016
8e11dfdb532b	D2308	tantsevov/dkazakov	Add a toggle on/off switch for pen pressure	Aug 8 2016
19ed2c6527ce		rempt	use barrierLock instead of lock	Aug 8 2016
32c30d42d749		rempt	Add Wavelet decompose plugin	Aug 8 2016
16dd3327914b		scottpetrovic	condense and group together layer context menu a bit better	Aug 6 2016
3ad8dd32383e		scottpetrovic	condense layers main menu	Aug 6 2016

Changes (35)

		Path
M		krita/krita.action
M		krita/krita.xmlgui
A		krita/pics/tool_transform/dark_transform_icons_penPressure_locked.png
A		krita/pics/tool_transform/light_transform_icons_penPressure_locked.png
M		krita/pics/tool_transform/tool-transform-icons.qrc
M		libs/koplugin/KisMimeDatabase.cpp
M		libs/ui/kis_canvas_resource_provider.cpp
M		libs/ui/kis_canvas_resource_provider.h
M		libs/ui/kis_paintop_box.cc
M		libs/ui/kis_paintop_box.h
M		libs/ui/tool/kis_painting_information_builder.cpp
M		libs/ui/tool/kis_painting_information_builder.h
M		libs/ui/tool/kis_tool_freehand_helper.cpp
M		plugins/dockers/defaultdockers/kis_layer_box.cpp
M		plugins/extensions/CMakeLists.txt
A	(dir)	plugins/extensions/waveletdecompose/
A		plugins/extensions/waveletdecompose/CMakeLists.txt
P		plugins/extensions/waveletdecompose/dlg_waveletdecompose.cpp Copied from plugins/extensions/histogram/dlg_histogram.cc
P		plugins/extensions/waveletdecompose/dlg_waveletdecompose.h Copied from plugins/extensions/shearimage/dlg_shearimage.h
P		plugins/extensions/waveletdecompose/kis_wavelet_kernel.cpp Copied from libs/image/kis_gaussian_kernel.cpp
P		plugins/extensions/waveletdecompose/kis_wavelet_kernel.h Copied from libs/image/kis_gaussian_kernel.h
P		plugins/extensions/waveletdecompose/kritawaveletdecompose.json Copied from plugins/extensions/bigbrother/kritabigbrother.json
A		plugins/extensions/waveletdecompose/waveletdecompose.cpp
P		plugins/extensions/waveletdecompose/waveletdecompose.h Copied from plugins/extensions/layersplit/layersplit.h
P		plugins/extensions/waveletdecompose/waveletdecompose.xmlgui Copied from plugins/extensions/layersplit/layersplit.xmlgui
A		plugins/extensions/waveletdecompose/wdg_waveletdecompose.ui
M		plugins/tools/basictools/kis_tool_line.cc
M		plugins/tools/basictools/kis_tool_line_helper.cpp
M		plugins/tools/basictools/kis_tool_line_helper.h
M		plugins/tools/basictools/kis_tool_move.cc
M		plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
M		plugins/tools/tool_transform2/kis_liquify_paint_helper.h
M		plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
M		plugins/tools/tool_transform2/kis_liquify_transform_strategy.h
M		plugins/tools/tool_transform2/kis_tool_transform.cc