appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.5.0.{build}
+version: 1.6.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 skip_tags: true

stuff/config/qss/Blue/Blue.qss

@@ -2309,6 +2309,8 @@ XsheetViewer {
   qproperty-LightBGColor: #eaebec;
   qproperty-DarkBGColor: #dbdcdd;
   qproperty-DarkLineColor: #8e9194;
+  qproperty-TableColor: #62628c;
+  qproperty-PegColor: #9f6e3c;
   qproperty-TimelineIconLineColor: rgba(0, 0, 0, 0.3);
   qproperty-XsheetColumnNameBgColor: rgba(0, 0, 0, 0);
   qproperty-XsheetDragBarHighlightColor: rgba(255, 255, 255, 0.15);

stuff/config/qss/Dark/Dark.qss

@@ -2309,6 +2309,8 @@ XsheetViewer {
   qproperty-LightBGColor: #d8d8d8;
   qproperty-DarkBGColor: #c9c9c9;
   qproperty-DarkLineColor: #7e7e7e;
+  qproperty-TableColor: #62628c;
+  qproperty-PegColor: #9f6e3c;
   qproperty-TimelineIconLineColor: rgba(0, 0, 0, 0.4);
   qproperty-XsheetColumnNameBgColor: rgba(0, 0, 0, 0);
   qproperty-XsheetDragBarHighlightColor: rgba(255, 255, 255, 0.15);

stuff/config/qss/Default/Default.qss

@@ -2309,6 +2309,8 @@ XsheetViewer {
   qproperty-LightBGColor: #f0f0f0;
   qproperty-DarkBGColor: #e1e1e1;
   qproperty-DarkLineColor: #969696;
+  qproperty-TableColor: #62628c;
+  qproperty-PegColor: #9f6e3c;
   qproperty-TimelineIconLineColor: rgba(0, 0, 0, 0.3);
   qproperty-XsheetColumnNameBgColor: rgba(0, 0, 0, 0);
   qproperty-XsheetDragBarHighlightColor: rgba(255, 255, 255, 0.15);

stuff/config/qss/Default/less/Default.less

@@ -442,6 +442,8 @@
 @xsheet-SoundPreviewTool-color:             darken(@xsheet-SoundColumnTrack-color, 20);
 @xsheet-ActiveCamera-color:                 #4073a3;
 @xsheet-OtherCamera-color:                  #5e9aa3;
+@xsheet-Table-color:                        #62628c;
+@xsheet-Peg-color:                          #9f6e3c;
 
 // Orientation: XSheet
 @xsheet-ColumnNameBg-color:                 rgba(0, 0, 0, 0);

stuff/config/qss/Default/less/layouts/xsheet.less

@@ -150,6 +150,8 @@ XsheetViewer {
   qproperty-DarkBGColor: @xsheet-DarkBG-color;
   qproperty-DarkLineColor: @xsheet-DarkLine-color;
 
+  qproperty-TableColor: @xsheet-Table-color;
+  qproperty-PegColor: @xsheet-Peg-color;
   // Column Header: Vertical
   qproperty-TimelineIconLineColor: @timeline-IconLine-color;
   qproperty-XsheetColumnNameBgColor: @xsheet-ColumnNameBg-color;

stuff/config/qss/Default/less/themes/Light.less

@@ -205,8 +205,10 @@
 @xsheet-MeshColumn-color:                   #b8a2cf;
 @xsheet-SoundColumn-color:                  #aad6d6;
 @xsheet-SoundTextColumn-color:              #c2c2c2;
-@xsheet-ActiveCamera-color:                 #79b5ee;
-@xsheet-OtherCamera-color:                  #6eb7c2;
+@xsheet-ActiveCamera-color:                 #b7dbfc;
+@xsheet-OtherCamera-color:                  #9ad9e2;
+@xsheet-Table-color:                        #cbcbe4;
+@xsheet-Peg-color:                          #dfb081;
 
 // Orientation: Timeline
 @timeline-IconLine-color:                   rgba(0, 0, 0, 0.144);
@@ -222,6 +224,10 @@
 
 // Node Viewer
 @schematic-viewer-bg-color: rgb(128, 128, 128);
+@schematic-ActiveCameraColor:      #79b5ee;
+@schematic-OtherCameraColor:       #6eb7c2;
+@schematic-ActiveOutputcolor:      @schematic-ActiveCameraColor;
+@schematic-OtherOutputcolor:       @schematic-OtherCameraColor;
 
 // Node Type Colors Adjustment
 @nodeLightness:  15;

stuff/config/qss/Default/less/themes/Neutral.less

@@ -231,6 +231,8 @@
 @xsheet-SoundColumnTrack-color:             rgba(0,0,0,0.8);
 @xsheet-ActiveCamera-color:                 rgb(100, 145, 190);
 @xsheet-OtherCamera-color:                  rgb(143, 156, 158);
+@xsheet-Table-color:                        #a4a4bf;
+@xsheet-Peg-color:                          #be8a56;
 
 // Timeline
 @timeline-FrameRangeMarkerLine-color:       darken(@bg, 15);

stuff/config/qss/Light/Light.qss

@@ -2301,14 +2301,16 @@ XsheetViewer {
   qproperty-SelectedSoundColumnColor: #9bc1c7;
   qproperty-SoundColumnHlColor: #f5ffe6;
   qproperty-SoundColumnTrackColor: rgba(0, 0, 0, 0.8);
-  qproperty-ActiveCameraColor: #79b5ee;
-  qproperty-SelectedActiveCameraColor: #79aad8;
-  qproperty-OtherCameraColor: #6eb7c2;
-  qproperty-SelectedOtherCameraColor: #71abb9;
+  qproperty-ActiveCameraColor: #b7dbfc;
+  qproperty-SelectedActiveCameraColor: #a4c4e1;
+  qproperty-OtherCameraColor: #9ad9e2;
+  qproperty-SelectedOtherCameraColor: #90c3cf;
   qproperty-LightLightBGColor: #c2c2c2;
   qproperty-LightBGColor: #ffffff;
   qproperty-DarkBGColor: #ffffff;
   qproperty-DarkLineColor: #ffffff;
+  qproperty-TableColor: #cbcbe4;
+  qproperty-PegColor: #dfb081;
   qproperty-TimelineIconLineColor: rgba(0, 0, 0, 0.144);
   qproperty-XsheetColumnNameBgColor: rgba(0, 0, 0, 0);
   qproperty-XsheetDragBarHighlightColor: rgba(255, 255, 255, 0.15);

stuff/config/qss/Neutral/Neutral.qss

@@ -2309,6 +2309,8 @@ XsheetViewer {
   qproperty-LightBGColor: #ffffff;
   qproperty-DarkBGColor: #ffffff;
   qproperty-DarkLineColor: #cecece;
+  qproperty-TableColor: #a4a4bf;
+  qproperty-PegColor: #be8a56;
   qproperty-TimelineIconLineColor: rgba(0, 0, 0, 0.3);
   qproperty-XsheetColumnNameBgColor: rgba(0, 0, 0, 0);
   qproperty-XsheetDragBarHighlightColor: rgba(255, 255, 255, 0.15);

stuff/profiles/layouts/rooms/Default/room1.ini

@@ -1,27 +1,28 @@
 [room]
 pane_0\name=ToolBar
-pane_0\geometry=@Rect(0 30 34 668)
+pane_0\geometry=@Rect(0 30 34 965)
 pane_1\name=FilmStrip
-pane_1\geometry=@Rect(1156 30 124 510)
+pane_1\geometry=@Rect(1796 30 124 720)
 pane_1\vertical=1
 pane_1\showCombo=1
 pane_1\navigator=1
 pane_2\name=ToolOptions
-pane_2\geometry=@Rect(0 0 1280 26)
+pane_2\geometry=@Rect(0 0 1920 26)
 pane_3\name=LevelPalette
-pane_3\geometry=@Rect(790 377 362 163)
+pane_3\geometry=@Rect(1452 482 340 268)
+pane_3\toolbarOnTop=0
 pane_3\viewtype=0
 pane_4\name=StyleEditor
-pane_4\geometry=@Rect(790 30 362 343)
+pane_4\geometry=@Rect(1452 30 340 448)
 pane_4\isVertical=true
 pane_4\visibleParts=7
 pane_4\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1]\0\0\0\x62\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
 pane_5\name=Timeline
-pane_5\geometry=@Rect(38 544 1242 154)
+pane_5\geometry=@Rect(38 754 1882 241)
 pane_5\orientation=LeftToRight
 pane_5\frameZoomFactor=60
 pane_6\name=SceneViewer
-pane_6\geometry=@Rect(38 30 748 510)
+pane_6\geometry=@Rect(38 30 1410 720)
 pane_6\visibleParts=5
 hierarchy="-1 1 [ 2 [ 0 [ [ 6 [ 4 3 ] 1 ] 5 ] ] ] "
 name=Drawing

stuff/profiles/layouts/rooms/Default/room3.ini

@@ -1,25 +1,27 @@
 [room]
 pane_0\name=ToolBar
-pane_0\geometry=@Rect(0 30 34 668)
+pane_0\geometry=@Rect(0 30 34 965)
 pane_1\name=ToolOptions
-pane_1\geometry=@Rect(0 0 1280 26)
+pane_1\geometry=@Rect(0 0 1920 26)
 pane_2\name=Xsheet
-pane_2\geometry=@Rect(334 479 734 219)
+pane_2\geometry=@Rect(547 628 948 367)
 pane_2\orientation=TopToBottom
 pane_2\frameZoomFactor=100
 pane_3\name=LevelPalette
-pane_3\geometry=@Rect(38 479 292 219)
+pane_3\geometry=@Rect(38 628 505 367)
+pane_3\toolbarOnTop=0
 pane_3\viewtype=2
 pane_4\name=StyleEditor
-pane_4\geometry=@Rect(38 30 611 445)
+pane_4\geometry=@Rect(38 30 312 594)
 pane_4\isVertical=true
 pane_4\visibleParts=15
 pane_4\splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xf4\0\0\0\xf5\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
 pane_5\name=StudioPalette
-pane_5\geometry=@Rect(1072 479 208 219)
+pane_5\geometry=@Rect(1499 628 421 367)
+pane_5\toolbarOnTop=0
 pane_5\viewtype=1
 pane_6\name=SceneViewer
-pane_6\geometry=@Rect(653 30 627 445)
+pane_6\geometry=@Rect(354 30 1566 594)
 pane_6\visibleParts=5
 hierarchy="-1 1 [ 1 [ 0 [ [ 4 6 ] [ 3 2 5 ] ] ] ] "
 name=Palette

stuff/profiles/layouts/rooms/Default/room4.ini

@@ -1,20 +1,21 @@
 [room]
 pane_0\name=FilmStrip
-pane_0\geometry=@Rect(1156 30 124 668)
+pane_0\geometry=@Rect(1797 30 123 965)
 pane_0\vertical=1
 pane_0\showCombo=1
 pane_0\navigator=1
 pane_1\name=LevelPalette
-pane_1\geometry=@Rect(927 470 225 228)
+pane_1\geometry=@Rect(1489 619 304 376)
+pane_1\toolbarOnTop=0
 pane_1\viewtype=1
 pane_2\name=ToolBar
-pane_2\geometry=@Rect(0 30 34 668)
+pane_2\geometry=@Rect(0 30 34 965)
 pane_3\name=ToolOptions
-pane_3\geometry=@Rect(0 0 1280 26)
+pane_3\geometry=@Rect(0 0 1920 26)
 pane_4\name=ColorModel
-pane_4\geometry=@Rect(927 30 225 436)
+pane_4\geometry=@Rect(1489 30 304 585)
 pane_5\name=SceneViewer
-pane_5\geometry=@Rect(38 30 885 668)
+pane_5\geometry=@Rect(38 30 1447 965)
 pane_5\visibleParts=5
 hierarchy="-1 1 [ 3 [ 2 5 [ 4 1 ] 0 ] ] "
 name=InknPaint

stuff/profiles/layouts/rooms/Default/room5.ini

@@ -1,26 +1,27 @@
 [room]
 pane_0\name=Xsheet
-pane_0\geometry=@Rect(801 30 351 402)
+pane_0\geometry=@Rect(1121 30 681 551)
 pane_0\orientation=TopToBottom
 pane_0\frameZoomFactor=100
 pane_1\name=ToolBar
-pane_1\geometry=@Rect(0 30 34 668)
+pane_1\geometry=@Rect(0 30 34 965)
 pane_2\name=ToolOptions
-pane_2\geometry=@Rect(0 0 1280 26)
+pane_2\geometry=@Rect(0 0 1920 26)
 pane_3\name=Schematic
-pane_3\geometry=@Rect(801 436 479 262)
+pane_3\geometry=@Rect(1121 585 799 410)
 pane_3\viewtype=1
 pane_4\name=FunctionEditor
-pane_4\geometry=@Rect(38 435 759 263)
+pane_4\geometry=@Rect(38 584 1079 411)
 pane_4\toggleStatus=0
 pane_4\showIbtwnValuesInSheet=true
+pane_4\syncSize=true
 pane_5\name=FilmStrip
-pane_5\geometry=@Rect(1156 30 124 402)
+pane_5\geometry=@Rect(1806 30 114 551)
 pane_5\vertical=1
 pane_5\showCombo=1
 pane_5\navigator=1
 pane_6\name=SceneViewer
-pane_6\geometry=@Rect(38 30 759 401)
+pane_6\geometry=@Rect(38 30 1079 550)
 pane_6\visibleParts=5
 hierarchy="-1 1 [ 2 [ 1 [ 6 4 ] [ [ 0 5 ] 3 ] ] ] "
 name=Animation

stuff/profiles/layouts/rooms/Default/room6.ini

@@ -1,17 +1,18 @@
 [room]
 pane_0\name=ToolOptions
-pane_0\geometry=@Rect(0 0 1280 26)
+pane_0\geometry=@Rect(0 0 1920 26)
 pane_1\name=FunctionEditor
-pane_1\geometry=@Rect(859 30 421 668)
+pane_1\geometry=@Rect(1180 30 740 965)
 pane_1\toggleStatus=0
 pane_1\showIbtwnValuesInSheet=true
+pane_1\syncSize=true
 pane_2\name=Schematic
-pane_2\geometry=@Rect(38 347 817 351)
+pane_2\geometry=@Rect(38 496 1138 499)
 pane_2\viewtype=0
 pane_3\name=ToolBar
-pane_3\geometry=@Rect(0 30 34 668)
+pane_3\geometry=@Rect(0 30 34 965)
 pane_4\name=SceneViewer
-pane_4\geometry=@Rect(38 30 817 313)
+pane_4\geometry=@Rect(38 30 1138 462)
 pane_4\visibleParts=5
 hierarchy="-1 1 [ 0 [ 3 [ 4 2 ] 1 ] ] "
 name=Schematic

stuff/profiles/layouts/rooms/Default/room7.ini

@@ -1,14 +1,15 @@
 [room]
 pane_0\name=Xsheet
-pane_0\geometry=@Rect(0 0 730 698)
+pane_0\geometry=@Rect(0 0 1050 995)
 pane_0\orientation=TopToBottom
 pane_0\frameZoomFactor=100
 pane_1\name=FunctionEditor
-pane_1\geometry=@Rect(734 345 546 353)
+pane_1\geometry=@Rect(1054 494 866 501)
 pane_1\toggleStatus=0
 pane_1\showIbtwnValuesInSheet=true
+pane_1\syncSize=true
 pane_2\name=SceneViewer
-pane_2\geometry=@Rect(734 0 546 341)
+pane_2\geometry=@Rect(1054 0 866 490)
 pane_2\visibleParts=5
 hierarchy="-1 0 [ 0 [ 2 1 ] ] "
 name=Xsheet

stuff/profiles/layouts/rooms/Default/room8.ini

@@ -1,5 +1,5 @@
 [room]
 pane_0\name=Tasks
-pane_0\geometry=@Rect(0 0 1280 698)
+pane_0\geometry=@Rect(0 0 1920 995)
 hierarchy="-1 0 0 "
 name=Tasks

stuff/profiles/layouts/rooms/Default/room9.ini

@@ -1,7 +1,7 @@
 [room]
 pane_0\name=Browser
-pane_0\geometry=@Rect(0 0 1280 356)
+pane_0\geometry=@Rect(0 0 1920 505)
 pane_1\name=SceneCast
-pane_1\geometry=@Rect(0 360 1280 338)
+pane_1\geometry=@Rect(0 509 1920 486)
 hierarchy="-1 1 [ 0 1 ] "
 name=Browser

toonz/cmake/BundleInfo.plist.in

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5</string>
+	<string>1.6</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>LSRequiresCarbon</key>

toonz/sources/common/psdlib/psd.cpp

@@ -176,7 +176,7 @@ bool TPSDReader::doImageResources() {
       hresd = FIXDPI(hres = read4Bytes(m_file));
       read2Bytes(m_file);
       read2Bytes(m_file);
-      vresd = FIXDPI(vres = read4Bytes(m_file));
+      vresd             = FIXDPI(vres = read4Bytes(m_file));
       m_headerInfo.vres = vresd;
       m_headerInfo.hres = hresd;
       fseek(m_file, savepos, SEEK_SET);
@@ -248,7 +248,7 @@ bool TPSDReader::readLayerInfo(int i) {
     fseek(m_file, 6 * li->channels + 12, SEEK_CUR);
     skipBlock(m_file);  // skip  "layer info: extra data";
   } else {
-    li->chan = (TPSDChannelInfo *)mymalloc(li->channels *
+    li->chan    = (TPSDChannelInfo *)mymalloc(li->channels *
                                            sizeof(struct TPSDChannelInfo));
     li->chindex = (int *)mymalloc((li->channels + 2) * sizeof(int));
     li->chindex += 2;  //
@@ -558,7 +558,7 @@ void TPSDReader::readImageData(TRasterP &rasP, TPSDLayerInfo *li,
     x1 = x0 + m_region.getLx() - 1;
     // controllo che x1 rimanga all'interno dell'immagine
     if (x1 >= m_headerInfo.cols) x1 = m_headerInfo.cols - 1;
-    y0                              = m_region.getP00().y;
+    y0 = m_region.getP00().y;
     // se y0 è fuori dalle dimensioni dell'immagine ritorna un'immagine vuota
     if (y0 >= m_headerInfo.rows) {
       free(rledata);
@@ -640,7 +640,7 @@ void TPSDReader::readImageData(TRasterP &rasP, TPSDLayerInfo *li,
     m_layersSavebox[li->layerId] = layerSaveBox2;
   else
     m_layersSavebox[0] = layerSaveBox2;
-  TRasterP smallRas    = rasP->extract(layerSaveBox2);
+  TRasterP smallRas = rasP->extract(layerSaveBox2);
   assert(smallRas);
   if (!smallRas) return;
   // Trovo l'indice di colonna del primo pixel del livello che deve essere letto
@@ -1005,11 +1005,11 @@ void readChannel(FILE *f, TPSDLayerInfo *li,
 
   for (ch = 0; ch < channels; ++ch) {
     if (!li) chan[ch].id = ch;
-    chan[ch].rowbytes    = rb;
-    chan[ch].comptype    = comp;
-    chan[ch].rows        = chan->rows;
-    chan[ch].cols        = chan->cols;
-    chan[ch].filepos     = pos;
+    chan[ch].rowbytes = rb;
+    chan[ch].comptype = comp;
+    chan[ch].rows     = chan->rows;
+    chan[ch].cols     = chan->cols;
+    chan[ch].filepos  = pos;
 
     if (!chan->rows) continue;
 
@@ -1030,7 +1030,7 @@ void readChannel(FILE *f, TPSDLayerInfo *li,
 
         if (count > 2 * chan[ch].rowbytes)  // this would be impossible
           count = last;                     // make a guess, to help recover
-        last    = count;
+        last = count;
 
         chan[ch].rowpos[j] = pos;
         pos += count;
@@ -1294,9 +1294,8 @@ int TPSDParser::getLevelIdByName(std::string levelName) {
       levelNameCount++;
     }
   }
-  if (lyid == 0 && lyid < 0) lyid = 0;
-  if (lyid < 0 && lyid != 0)
-    throw TImageException(m_path, "Layer ID not exists");
+
+  if (lyid < 0) throw TImageException(m_path, "Layer ID not exists");
   return lyid;
 }
 int TPSDParser::getFramesCount(int levelId) {