Diffusion Krita bf48af92c0e8

Merge remote-tracking branch 'remotes/origin/master' into jounip/T8764-clone…

Authored by jounip on Oct 7 2018, 10:40 AM.

Description

Merge remote-tracking branch 'remotes/origin/master' into jounip/T8764-clone-frames

  1. Conflicts:
  2. libs/image/kis_layer.cc
  3. libs/image/kis_transaction_data.cpp

Details

Committed
jounipOct 7 2018, 10:40 AM
Parents
R37:00d20f93f504: fixuifiles
R37:3aa30ee33f2f: Add cycle actions and indicators to the timeline
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
00d20f93f504pino
fixuifiles 
Oct 7 2018
b3a62eb6d786rempt
BUG:399435 Remove a wrong assert when getting the keyframechannel 
Oct 6 2018
596d1e9340e4rempt
Merge branch 'mzhou/T8646-palette-docker' 
Oct 6 2018
4509716542c5rempt
Revert "Refresh the UI on the palette docker if color is removed" 
Oct 6 2018
b0d29aa7350erempt
Create the text shape with the currently selected fg color. 
Oct 6 2018
73d083e169d7rempt
Rename KoCanvasResourceManager to KoCanvasResourceProvider 
Oct 6 2018
39b549a4caf5scottpetrovic
Condense logic for deleting rows to hopefully help with crash happening when… 
Oct 6 2018
949991c40b6cwoltherav
Merge branch 'master' into mzhou/T8646-palette-docker 
Oct 6 2018
da5a8f93bd01scottpetrovic
Refresh the UI on the palette docker if color is removed 
Oct 6 2018
17ed5faab215scottpetrovic
BUG:399394 Change welcome screen URL links from push buttons to labels 
Oct 6 2018
6df0d7ddfc85scottpetrovic
Fix initialization order for decorator 
Oct 5 2018
32de1b43f625scottpetrovic
Make T icon stroke smaller 
Oct 5 2018
14e467bf0ff9scottpetrovic
Make variable name consistent with others and make pointer safer with… 
Oct 5 2018
f4f850e2a513woltherav
Add some i18n tags, set default groupname to be used. 
Oct 5 2018
89605603d2dawoltherav
Ensure there's a default name being made so that there's a point to the… 
Oct 5 2018
cd92bba71876woltherav
Make the colour count also take into account groups. 
Oct 5 2018
ddf9ec0e02e4woltherav
Rewrite function to be less confusing. 
Oct 5 2018
7f2258d3435crempt
Fix logic: columnCount is the count of, not the index into the vector 
Oct 5 2018
64211bf801d0woltherav
Ensure that old palettes get loaded nicely. 
Oct 5 2018
f2a8ba09c29ewoltherav
Extra check to avoid saving empty palettes to the kra file. 
Oct 5 2018
7a5351424310rempt
Merge branch 'master' into mzhou/T8646-palette-docker 
Oct 5 2018
c36535672f75rempt
Add a close button to the tablet tester. 
Oct 5 2018
9a9f152724e0rempt
Add a cmake option to disable our own tablet support 
Oct 5 2018
8ba9f448b1e6rempt
Remove KisTabletEvent 
Oct 5 2018
ec360795800erempt
Fix whitespace 
Oct 5 2018
6bbb1b2cd85frempt
Fix asserts 
Oct 5 2018
12967af9e81frempt
Remove two wrong asserts. 
Oct 5 2018
24d2b6bee643rempt
BUG:399397 Disable drag & drop in the recent documents list 
Oct 5 2018
bcb6462f5764langkamp
Stretch button in the animation docker horizontally to fill the available space. 
Oct 4 2018
0f87010adf82D15905jtamate
Descend the array in the right way 
Oct 4 2018
7b592ce66cd1woltherav
Turn the global checkbox into a buttongroup with resource folder/document. 
Oct 4 2018
19f3d22cbde0woltherav
Fix saving to the right file extension. 
Oct 4 2018
d66f43616ac7rempt
Fix TestXmlWriter 
Oct 4 2018
2c3b9738e7ebrempt
Build zlib first on windows 
Oct 4 2018
8111b591fad8rempt
fix more copy destinations 
Oct 4 2018
8c7d2542c6e7rempt
Add a / to the copy command's destination 
Oct 4 2018
d6b1568f4bd6rempt
Revert "Try to do without the lzma headers" 
Oct 4 2018
230fb0b27f52scottpetrovic
Add T icon to text vector objects to more easily switch between selection and… 
Oct 3 2018
512e4565add1langkamp
Fill polyline if some fill style was selected BUG:399135 
Oct 3 2018
c59cd318046brempt
Just remove all those hard-coded QMdiWindow system menu actions... 
Oct 3 2018
ea49ede1e2calangkamp
Jump to transform tool after paste. Can be enabled in the settings. 
Oct 3 2018
0d7d19eacd57rempt
Remove the export_to_pdf action definition 
Oct 3 2018
c166c5b6d626rempt
Try to do without the lzma headers 
Oct 3 2018
7bf022087a55dkazakov
Disable zoom-in/out actions when editing text in rich-text mode 
Oct 3 2018
d37a77d516aarempt
Use copy_directory instead 
Oct 3 2018
06403e1db358rempt
Copy the include files to the correct place 
Oct 3 2018
b7f67d3d9466rempt
enable lzma in tiff again 
Oct 3 2018
a4ab13d7dba6rempt
Add lzma to the windows build targets 
Oct 3 2018
1cb60f1e5d09rempt
Install liblzma on Windows 
Oct 3 2018
454b54c2f464rempt
Add liblzma to the external deps 
Oct 3 2018