Skip to content

Commit a474e78

Browse files
manongjohnmanongjohn
committed
Merge branch 'master' from opentoonz
2 parents ec1ecaf + f133299 commit a474e78

File tree

168 files changed

+3519
-941
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+3519
-941
lines changed

‎stuff/config/current.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,8 @@
816816

817817
<!------------------------------ Function Editor ------------------------------------------->
818818

819-
<item>W_NS "N/S" </item>
820-
<item>W_EW "E/W" </item>
819+
<item>W_Y "Y" </item>
820+
<item>W_X "X" </item>
821821
<item>W_Z "Z" </item>
822822
<item>W_SO "SO" </item>
823823
<item>W_Rotation "Rotation" </item>

‎stuff/config/qss/Blue/Blue.qss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,13 @@ SpreadsheetViewer {
23782378
qproperty-KeyFrameColor: #995d1d;
23792379
qproperty-KeyFrameBorderColor: #db9041;
23802380
qproperty-SelectedKeyFrameColor: #a2835b;
2381+
qproperty-IgnoredKeyFrameColor: #ac2a39;
2382+
qproperty-SelectedIgnoredKeyFrameColor: #b25872;
23812383
qproperty-InBetweenColor: #666250;
23822384
qproperty-InBetweenBorderColor: #b0aa91;
23832385
qproperty-SelectedInBetweenColor: #717970;
2386+
qproperty-IgnoredInBetweenColor: #8a695e;
2387+
qproperty-SelectedIgnoredInBetweenColor: #93807d;
23842388
qproperty-SelectedEmptyColor: rgba(96, 109, 118, 0.5);
23852389
qproperty-SelectedSceneRangeEmptyColor: rgba(96, 109, 118, 0.5);
23862390
qproperty-TextColor: #d6d8dd;

‎stuff/config/qss/Dark/Dark.qss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,13 @@ SpreadsheetViewer {
23782378
qproperty-KeyFrameColor: #995d1d;
23792379
qproperty-KeyFrameBorderColor: #db9041;
23802380
qproperty-SelectedKeyFrameColor: #a2835b;
2381+
qproperty-IgnoredKeyFrameColor: #ac2a39;
2382+
qproperty-SelectedIgnoredKeyFrameColor: #b25872;
23812383
qproperty-InBetweenColor: #666250;
23822384
qproperty-InBetweenBorderColor: #b0aa91;
23832385
qproperty-SelectedInBetweenColor: #717970;
2386+
qproperty-IgnoredInBetweenColor: #8a695e;
2387+
qproperty-SelectedIgnoredInBetweenColor: #93807d;
23842388
qproperty-SelectedEmptyColor: rgba(90, 100, 106, 0.5);
23852389
qproperty-SelectedSceneRangeEmptyColor: rgba(90, 100, 106, 0.5);
23862390
qproperty-TextColor: #e6e6e6;

‎stuff/config/qss/Default/Default.qss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,13 @@ SpreadsheetViewer {
23782378
qproperty-KeyFrameColor: #995d1d;
23792379
qproperty-KeyFrameBorderColor: #db9041;
23802380
qproperty-SelectedKeyFrameColor: #a2835b;
2381+
qproperty-IgnoredKeyFrameColor: #ac2a39;
2382+
qproperty-SelectedIgnoredKeyFrameColor: #b25872;
23812383
qproperty-InBetweenColor: #666250;
23822384
qproperty-InBetweenBorderColor: #b0aa91;
23832385
qproperty-SelectedInBetweenColor: #717970;
2386+
qproperty-IgnoredInBetweenColor: #8a695e;
2387+
qproperty-SelectedIgnoredInBetweenColor: #93807d;
23842388
qproperty-SelectedEmptyColor: rgba(103, 113, 119, 0.5);
23852389
qproperty-SelectedSceneRangeEmptyColor: rgba(103, 113, 119, 0.5);
23862390
qproperty-TextColor: #e6e6e6;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,13 @@
556556
@function-KeyFrame-color: darken(desaturate(spin(@keyframe-total-color, 0.0000), 0.7570), 8.4314);
557557
@function-KeyFrameBorder-color: lighten(@function-KeyFrame-color, 20);
558558
@function-SelectedKeyFrame-color: mix(shade(@function-KeyFrame-color, -40), @cellHighlightTintColor, 60);
559+
@function-IgnoredKeyFrame-color: rgb(172,42,57);
560+
@function-SelectedIgnoredKeyFrame-color: mix(shade(@function-IgnoredKeyFrame-color, -40), @cellHighlightTintColor, 60);
559561
@function-Inbetween-color: darken(desaturate(spin(@keyframe-inbetween-color, 0.4423), 4.8071), 7.2549);
560562
@function-InbetweenBorder-color: lighten(@keyframe-inbetween-color, 20);
561563
@function-SelectedInbetween-color: mix(shade(@function-Inbetween-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
564+
@function-IgnoredInbetween-color: rgb(138,105,94);
565+
@function-SelectedIgnoredInbetween-color: mix(shade(@function-IgnoredInbetween-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
562566

563567
// Expression Field
564568
@function-ExpressionFieldBG-color: lighten(@bg, 61.9608);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,13 @@ SpreadsheetViewer {
277277
qproperty-KeyFrameColor: @function-KeyFrame-color;
278278
qproperty-KeyFrameBorderColor: @function-KeyFrameBorder-color;
279279
qproperty-SelectedKeyFrameColor: @function-SelectedKeyFrame-color;
280+
qproperty-IgnoredKeyFrameColor: @function-IgnoredKeyFrame-color;
281+
qproperty-SelectedIgnoredKeyFrameColor: @function-SelectedIgnoredKeyFrame-color;
280282
qproperty-InBetweenColor: @function-Inbetween-color;
281283
qproperty-InBetweenBorderColor: @function-InbetweenBorder-color;
282284
qproperty-SelectedInBetweenColor: @function-SelectedInbetween-color;
285+
qproperty-IgnoredInBetweenColor: @function-IgnoredInbetween-color;
286+
qproperty-SelectedIgnoredInBetweenColor: @function-SelectedIgnoredInbetween-color;
283287
qproperty-SelectedEmptyColor: @xsheet-SelectedEmptyCell-color; // paired
284288
qproperty-SelectedSceneRangeEmptyColor: @function-SelectedSceneRangeEmpty-color;
285289
qproperty-TextColor: @xsheet-text-color; // paired

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,10 @@
234234
@function-panel-bg-color: @schematic-viewer-bg-color;
235235
@function-panel-OtherCurves-color: rgb(218, 218, 218);
236236
@function-panel-Text-color: @text-color;
237+
237238
@function-panel-Sub-color: #fff;
238239
@function-panel-Selected-color: #ffe033;
240+
@function-IgnoredKeyFrame-color: rgb(203,87,101);
241+
@function-IgnoredInbetween-color: rgb(194,156,146);
239242

240243
@function-SelectedKeyFrame-color: mix(shade(@function-KeyFrame-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);

‎stuff/config/qss/Light/Light.qss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,13 @@ SpreadsheetViewer {
23782378
qproperty-KeyFrameColor: #edaa64;
23792379
qproperty-KeyFrameBorderColor: #bb6a16;
23802380
qproperty-SelectedKeyFrameColor: #c9a278;
2381+
qproperty-IgnoredKeyFrameColor: #cb5765;
2382+
qproperty-SelectedIgnoredKeyFrameColor: #eb96ad;
23812383
qproperty-InBetweenColor: #e2dbcc;
23822384
qproperty-InBetweenBorderColor: #ac9f82;
23832385
qproperty-SelectedInBetweenColor: #c2c4c0;
2386+
qproperty-IgnoredInBetweenColor: #c29c92;
2387+
qproperty-SelectedIgnoredInBetweenColor: #ab9898;
23842388
qproperty-SelectedEmptyColor: rgba(146, 153, 158, 0.5);
23852389
qproperty-SelectedSceneRangeEmptyColor: rgba(146, 153, 158, 0.5);
23862390
qproperty-TextColor: #000;

‎stuff/config/qss/Neutral/Neutral.qss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,9 +2378,13 @@ SpreadsheetViewer {
23782378
qproperty-KeyFrameColor: #c4833e;
23792379
qproperty-KeyFrameBorderColor: #64421f;
23802380
qproperty-SelectedKeyFrameColor: #deae7b;
2381+
qproperty-IgnoredKeyFrameColor: #ac2a39;
2382+
qproperty-SelectedIgnoredKeyFrameColor: #ca6377;
23812383
qproperty-InBetweenColor: #b4b09e;
23822384
qproperty-InBetweenBorderColor: #6e6c64;
23832385
qproperty-SelectedInBetweenColor: #c7c7bb;
2386+
qproperty-IgnoredInBetweenColor: #8a695e;
2387+
qproperty-SelectedIgnoredInBetweenColor: #a08680;
23842388
qproperty-SelectedEmptyColor: rgba(155, 159, 162, 0.5);
23852389
qproperty-SelectedSceneRangeEmptyColor: rgba(155, 159, 162, 0.5);
23862390
qproperty-TextColor: #000;

‎toonz/sources/colorfx/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ add_definitions(
2626
)
2727

2828
if(BUILD_ENV_APPLE)
29-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib")
29+
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib")
3030
add_dependencies(colorfx tnzcore tnzbase)
3131
endif()
3232

0 commit comments

Comments
 (0)