Diffusion Krita 7ce94758d0e4

Merge branch 'master' into krita-testing-wolthera
7ce94758d0e4
Actions

Authored by woltherav on Jul 27 2016, 8:21 PM.

Description

Merge branch 'master' into krita-testing-wolthera

Details

Committed

woltherav

Jul 27 2016, 8:21 PM

Parents

R37:38c4fc32021a: Merge branch 'master' into krita-testing-wolthera
R37:9ed50d15aa53: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

woltherav committed R37:7ce94758d0e4: Merge branch 'master' into krita-testing-wolthera (authored by woltherav).Jul 27 2016, 8:21 PM

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

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit		Author	Details	Committed
9ed50d15aa53		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 25 2016
14ee7993d0a4		akapustin/timotheegiet	Show previous color in color selector	Jul 24 2016
48287eb395e6		tantsevov/dkazakov	Added showing coordinates when using Move Tool.	Jul 23 2016
9d183892ade9		nishantjr	Merge branch 'nishant/ratio-option'	Jul 23 2016
703acc9dfc99		nishantjr	KisSpacingInformation: Remove redundant isIsotropic member.	Jul 22 2016
f6b1c94cca22	D2213	akapustin/dkazakov	FEATURE: Don't exit Isolate Layer mode when switching layer	Jul 22 2016
606b33652b48		nishantjr	KisMaskGenerator::effectiveSrcHeight: Use scaleY instead of scaleX	Jul 22 2016
4f3d21273b4b		fazek	Switch off "canvas only" mode before closing the main window	Jul 21 2016
432003fb1c15		nishantjr	KisAutoBrush: override maskHeight so we get a more appropriate value when ratio…	Jul 21 2016
b6f2f4038e5f		nishantjr	KisGaussCircleMaskGenerator: update ycoef when scale changes	Jul 21 2016
28db9864db90		nishantjr	QImagePyramid: Correctly take into account ratio	Jul 21 2016
f24b30e6c0f5		nishantjr	AutoBrushTest: Extract function dabSizeHelper to peform repeated test logic.	Jul 21 2016
bacb4d999540		nishantjr	KisBrushOp: Add ratioOption to KisBrush and pass ratio to DabCache	Jul 21 2016
b36803841c45		nishantjr	KisDabShape: convenience class for grouping scale, ratio and rotation.	Jul 21 2016
93f2ab2044ae		nishantjr	Add Q_DECL_OVERRIDE to appropriate members of KisBrush	Jul 21 2016
d80c80a31058		nishantjr	Fix transformation being applied twice in DeformBrush	Jul 21 2016
ea7813916aac		nishantjr	Paintops::brushOutline(): Extract function makeTiltIndicator	Jul 21 2016
85ed3d088b39		nishantjr	Make member function static. It wasn't using any class members.	Jul 21 2016
d4defeee65fa	D2236	dkazakov	Add API documentation to new classes	Jul 20 2016
5884065cb3fe	D2236	dkazakov	Don't keep the default tile data blocked from swapping	Jul 20 2016
e951aa70ef0c		rempt	Use devtools-3 instead of 2	Jul 20 2016
bcdae430d503		rempt	Disable the histogram docker until Eugene's branch is ready	Jul 19 2016
1b2546f50ebd	D2210	tantsevov/dkazakov	Added ability to enter groups with PgUp/PgDown shortcuts	Jul 19 2016
efc2047b46c4	D2127	dkazakov	Add quick flip buttons to transform docker	Jul 19 2016
f7e283e0a300		dkazakov	Revert "Add quick flip buttons to transform docker"	Jul 19 2016
f594e3ea8a90		rempt	BUG:363910 Brush freezes after lifting stylus pen away from tablet on OSX	Jul 18 2016
00152c78bd1d	D2127	dkazakov	Add quick flip buttons to transform docker	Jul 18 2016
a3e2d2d27655		scottpetrovic	BUG: 361653 Prevent the preview assistant signal from firing twice	Jul 17 2016
bf8432f38fc2		dkazakov	Fix warning	Jul 15 2016
a8f901e40fb7		dkazakov	Fix releasing the node pixes memory when closing the document	Jul 15 2016
54282a72cee6		dkazakov	Implement data pool for the chunks in openGL canvas updates	Jul 15 2016
550ff114cbae		dkazakov	Release all the tile pools forcefully when a document is closed	Jul 15 2016
22bf0fa51248		dkazakov	Don't keep the default tile data blocked from swapping	Jul 15 2016
5febe2376823		rempt	Fix two warnings	Jul 14 2016
837191320025		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 14 2016
06abc696b475		rempt	Reset the version number following the new Krita release strategy.	Jul 14 2016
5232790eee9f		l10n daemon script	SVN_SILENT made messages (after extraction)	Jul 14 2016
14c814028e13		rempt	Merge branch 'krita/3.0'	Jul 13 2016
38f27574c903		dkazakov	Fix a crash in KisToolPaint caused by a passed-through event	Jul 13 2016
8b7a11de6ac1	D2115	dkazakov	Fix HSV/HSL filter widget slider management	Jul 13 2016
0af993a1a696		rempt	Remove superfluous clearing of lists	Jul 12 2016
0863dc11c13d		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 10 2016
8e040079cba7		l10n daemon script	SVN_SILENT made messages (after extraction)	Jul 10 2016
f17b229a10bf		dkazakov	"Black", not "Back" point compensation	Jul 10 2016
b8612965c102		dkazakov	Fix another misprint in the localizable string	Jul 10 2016
78dd47c9f388		dkazakov	Fix a misprint in a menu tooltip	Jul 10 2016
d28dbf2b1f4b		rempt	update instructions	Jul 8 2016
941ee63d0d34		rempt	Merge branch 'krita/3.0'	Jul 8 2016
15662fd7ee89		victorw	Allow user to input size values higher than 99 when opening .r16 files	Jul 7 2016
021b34a3c876		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 7 2016

Changes (156)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			CMakeLists.txt
	M			Messages.sh
	M			README.md
	D			cmake/kde_macro/FindSharedMimeInfo.cmake
	M			krita/CMakeLists.txt
	M			krita/crashreporter/CMakeLists.txt
	M			krita/crashreporter/Messages.sh
	M			krita/crashreporter/main.cpp
	M			krita/data/actions/MoveTool.action
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/krita.action
	V			krita/{krita.appdata.xml → org.kde.krita.appdata.xml}
	V			krita/{krita.desktop → org.kde.krita.desktop}
	M			krita/krita.xmlgui
	M			krita/kritamenu.action
	V			krita/{org.kde.krita.appdata.xml ← krita.appdata.xml}
	V			krita/{org.kde.krita.desktop ← krita.desktop}
	A			krita/pics/tool_transform/dark_transform_icons_mirror_x.svg
	A			krita/pics/tool_transform/dark_transform_icons_mirror_y.svg
	A			krita/pics/tool_transform/dark_transform_icons_rotate_ccw.svg
	A			krita/pics/tool_transform/dark_transform_icons_rotate_cw.svg
	A			krita/pics/tool_transform/light_transform_icons_mirror_x.svg
	A			krita/pics/tool_transform/light_transform_icons_mirror_y.svg
	A			krita/pics/tool_transform/light_transform_icons_rotate_ccw.svg
	A			krita/pics/tool_transform/light_transform_icons_rotate_cw.svg
	M			krita/pics/tool_transform/tool-transform-icons.qrc
	M			libs/brush/kis_auto_brush.cpp
	M			libs/brush/kis_auto_brush.h
	M			libs/brush/kis_brush.cpp
	M			libs/brush/kis_brush.h
	M			libs/brush/kis_brushes_pipe.h
	P			libs/brush/kis_dab_shape.h Copied from plugins/paintops/spray/random_gauss.h
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_imagepipe_brush.h
	M			libs/brush/kis_qimage_pyramid.cpp
	M			libs/brush/kis_qimage_pyramid.h
	M			libs/brush/kis_text_brush.cpp
	M			libs/brush/kis_text_brush.h
	M			libs/brush/tests/kis_auto_brush_test.cpp
	M			libs/brush/tests/kis_auto_brush_test.h
	M			libs/brush/tests/kis_brush_test.cpp
	M			libs/brush/tests/kis_imagepipe_brush_test.cpp
	M			libs/flake/KoShapeFactoryBase.cpp
	M			libs/flake/KoShapeFactoryBase.h
	M			libs/flake/tools/KoPathPointMoveStrategy.cpp
	M			libs/flake/tools/KoPathTool.cpp
	M			libs/flake/tools/KoPathTool.h
	M			libs/global/kis_global.h
	M			libs/image/CMakeLists.txt
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/image/brushengine/kis_paintop_settings.h
	M			libs/image/kis_base_mask_generator.cpp
	M			libs/image/kis_default_bounds.cpp
	M			libs/image/kis_distance_information.h
	M			libs/image/kis_gauss_circle_mask_generator.cpp
	M			libs/image/kis_image.cc
	M			libs/image/kis_mask.cc
	M			libs/image/kis_paint_device.cc
	M			libs/image/kis_raster_keyframe_channel.cpp
	M			libs/image/kis_update_time_monitor.cpp
	M			libs/image/tiles3/kis_tile_data.cc
	M			libs/image/tiles3/kis_tile_hash_table_p.h
	M			libs/image/tiles3/kis_tiled_data_manager.cc
	M			libs/pigment/compositeops/KoStreamedMath.h
	M			libs/ui/CMakeLists.txt
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisSaveGroupVisitor.cpp
	M			libs/ui/KisSaveGroupVisitor.h
	M			libs/ui/KisTemplateCreateDia.cpp
	M			libs/ui/canvas/kis_canvas_controller.cpp
	M			libs/ui/dialogs/kis_dlg_layer_style.cpp
	M			libs/ui/forms/wdgcolorsettings.ui
	M			libs/ui/input/kis_input_manager.cpp
	M			libs/ui/input/kis_input_manager_p.cpp
	M			libs/ui/kis_file_layer.cpp
	M			libs/ui/kis_file_layer.h
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_layer_manager.h
	M			libs/ui/kis_node_filter_proxy_model.cpp
	M			libs/ui/kis_node_filter_proxy_model.h
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_painting_assistants_manager.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/kis_safe_document_loader.cpp
	M			libs/ui/kis_safe_document_loader.h
	M			libs/ui/opengl/kis_opengl_image_textures.cpp
	M			libs/ui/opengl/kis_opengl_image_textures.h
	A			libs/ui/opengl/kis_texture_tile_info_pool.h
	D			libs/ui/opengl/kis_texture_tile_update_info.cpp
	M			libs/ui/opengl/kis_texture_tile_update_info.h
	M			libs/ui/recorder/kis_recorded_filter_action_editor.cc
	M			libs/ui/tool/kis_tool.h
	M			libs/ui/tool/kis_tool_freehand.cc
	M			libs/ui/tool/kis_tool_freehand.h
	M			libs/widgetutils/KoFileDialog.cpp
	M			packaging/linux/appimage/build-deps.sh
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.cc
	M			plugins/assistants/RulerAssistant/kis_ruler_assistant_tool.h
	M			plugins/dockers/CMakeLists.txt
	M			plugins/dockers/advancedcolorselector/kis_color_selector.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp
	M			plugins/dockers/advancedcolorselector/kis_color_selector_base.h
	M			plugins/dockers/animation/kis_equalizer_button.cpp
	M			plugins/dockers/animation/kis_equalizer_column.cpp
	M			plugins/dockers/animation/kis_equalizer_column.h
	M			plugins/dockers/animation/kis_equalizer_slider.cpp
	M			plugins/dockers/animation/kis_equalizer_slider.h
	M			plugins/dockers/animation/kis_equalizer_widget.cpp
	M			plugins/dockers/animation/kis_equalizer_widget.h
	M			plugins/dockers/animation/timeline_color_scheme.cpp
	M			plugins/dockers/animation/timeline_color_scheme.h
	M			plugins/dockers/defaultdockers/kis_layer_box.cpp
	M			plugins/extensions/bigbrother/CMakeLists.txt
	M			plugins/extensions/gmic/CMakeLists.txt
	M			plugins/filters/colorsfilters/kis_hsv_adjustment_filter.cpp
	M			plugins/filters/colorsfilters/kis_hsv_adjustment_filter.h
	M			plugins/filters/levelfilter/kis_level_filter.cpp
	M			plugins/impex/heightmap/kis_wdg_options_heightmap.ui
	M			plugins/impex/jpeg/CMakeLists.txt
	M			plugins/paintops/chalk/kis_chalk_paintop_settings.cpp
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
	M			plugins/paintops/defaultpaintops/brush/kis_brushop.cpp
	M			plugins/paintops/defaultpaintops/brush/kis_brushop.h
	M			plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
	M			plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.cpp
	M			plugins/paintops/deform/deform_brush.cpp
	M			plugins/paintops/deform/kis_deform_paintop_settings.cpp
	M			plugins/paintops/experiment/kis_experiment_paintop_settings.cpp
	M			plugins/paintops/filterop/kis_filterop.cpp
	M			plugins/paintops/gridbrush/kis_grid_paintop_settings.cpp
	M			plugins/paintops/hairy/kis_hairy_paintop.cpp
	M			plugins/paintops/hatching/kis_hatching_paintop.cpp
	M			plugins/paintops/libpaintop/CMakeLists.txt
	M			plugins/paintops/libpaintop/kis_brush_based_paintop_settings.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.cpp
	M			plugins/paintops/libpaintop/kis_dab_cache.cpp
	M			plugins/paintops/libpaintop/kis_dab_cache.h
	M			plugins/paintops/libpaintop/kis_pressure_ratio_option.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop.cpp
	M			plugins/paintops/sketch/kis_sketch_paintop_settings.cpp
	M			plugins/paintops/spray/kis_spray_paintop_settings.cpp
	M			plugins/paintops/spray/spray_brush.cpp
	M			plugins/paintops/tangentnormal/kis_tangent_normal_paintop.cpp
	M			plugins/tools/basictools/kis_tool_fill.cc
	M			plugins/tools/basictools/kis_tool_move.cc
	M			plugins/tools/basictools/kis_tool_move.h
	M			plugins/tools/basictools/kis_tool_movetooloptionswidget.cpp
	M			plugins/tools/basictools/kis_tool_movetooloptionswidget.h
	M			plugins/tools/basictools/wdgmovetool.ui
	M			plugins/tools/defaulttool/defaulttool/ShapeMoveStrategy.cpp
	M			plugins/tools/tool_transform2/kis_tool_transform_config_widget.cpp
	M			plugins/tools/tool_transform2/kis_tool_transform_config_widget.h
	M			plugins/tools/tool_transform2/wdg_tool_transform.ui