Squashed commit of the following:
commit f05b5b3ff8286f6252c2a3f3c8c367f8a5b821b5 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 13:05:25 2022 -0700 final consistency modifications commit 4f27718d46de9660822eb197b0e900be947ec515 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 11:40:58 2022 -0700 opengl: don't set texture options for null texture commit bb54cfcf4e219e1cbf1ecc6b5552cca75e6e1573 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 11:40:29 2022 -0700 rename inputs commit e5ac8fffa2ac15f5549b6da5f42b05659c6d020f Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 10:37:23 2022 -0700 change alpha association formula commit dee09a88f17552e3f98be8940966822e45d6df4f Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 10:36:58 2022 -0700 glsl: use constants to improve readability commit aedc75ebee11b61198f29c464501a2ddb0506129 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 10:36:26 2022 -0700 changed id capitalization commit 470b2bb85b51c4a57c109d3fb230088a81024277 Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 10:35:53 2022 -0700 node: update categories commit c78dacad82051dfbb3e40c92cfaf456dbff2de0d Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 09:22:57 2022 -0700 updated shaders to es 3 commit 1e7544be93e55916c94cd91629ec5eef728bfad8 Merge: 1bbb8d7f925d019609Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue Apr 12 09:02:32 2022 -0700 Merge branch 'master' into pr/1818 commit 1bbb8d7f9acd75cb4498733f105fbe0487c0db9c Author: brimson <40442071+brimson@users.noreply.github.com> Date: Tue Jan 18 18:36:24 2022 -0700 Simplify colordifferencekey.frag Avoiding extra MOV instruction commit c7cf1021ce5a3d090833e94e4bc212cc51a61a2a Author: brimson <40442071+brimson@users.noreply.github.com> Date: Tue Jan 18 11:43:02 2022 -0700 Revert switch-case changes Thanks Simran, MattKC, and Wilshaw for the clarifications commit 882ffeede01b81f0cb4dfd885ba05bf66119ac7e Author: brimson <40442071+brimson@users.noreply.github.com> Date: Tue Jan 18 00:06:31 2022 -0700 Optimize despill shader Turn previous averaging from (1 MAD + 1 MUL) to (1 DP2), reuse the result to prevent recalculation. commit 0c93f519977fa34840ab03d51addcf2456f931d8 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sat Jan 8 17:23:49 2022 +0000 Cleanup commit 222560ce1a4666899b1111854d4d549dd7ba1357 Merge: 96e21c2b4d3ffeaa35Author: ThomasWilshaw <thomaswilshaw@gmail.com> Date: Tue Jan 4 23:50:39 2022 +0000 Merge branch 'master' into color_key commit 96e21c2b43db3bf1051aca696970509292159548 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Tue Jan 4 23:45:26 2022 +0000 Rename and reoganise keying nodes commit 6d42ed23a69ebdb1f5b399957f0b37434d0519dd Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Tue Jan 4 23:04:50 2022 +0000 Move despill code to it's own node commit e97ab2e16fd1d4e2f2ff145b8c023ff0e1ee451e Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Mon Jan 3 21:39:48 2022 +0000 Add option for blue screens commit 2346f44e5af48bb9547c77c4c08ee7abfcb09393 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Mon Jan 3 21:14:55 2022 +0000 Optimise node slightly commit 446522edcf63525fafe7a97cf6d59b7ea0385460 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Mon Jan 3 21:10:03 2022 +0000 Fix GL ES compile error commit a765ce6c6f3e0c0e996f08e2a3ef1101818098e8 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 18:27:24 2022 +0000 Cleanup commit d268e0645df34aa306dc391d1dc10bf335524f94 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 18:03:26 2022 +0000 Fix core matte and change Darks start value commit 30b024dc5f59dd60ffc5012eee7a79201ed4f9c3 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 17:26:39 2022 +0000 Change matte controls and cleanup commit b742a9ba7ed651785a0781289a4c03fd4fb72e03 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 16:31:41 2022 +0000 Add a core and garbage matte commit f814d036b61b8de090df4c1f080c124b98b432d6 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 03:31:20 2022 +0000 Improve basic keyer commit 4995ec3b9b92c9b4cb0dc31a247d585b2a47e408 Author: Thomas Wilshaw <thomaswilshaw@gmail.com> Date: Sun Jan 2 00:23:18 2022 +0000 Start simple color key node
This commit is contained in:
+4
-10
@@ -1668,16 +1668,14 @@ void Node::DisconnectAll()
|
||||
QString Node::GetCategoryName(const CategoryID &c)
|
||||
{
|
||||
switch (c) {
|
||||
case kCategoryInput:
|
||||
return tr("Input");
|
||||
case kCategoryOutput:
|
||||
return tr("Output");
|
||||
case kCategoryGeneral:
|
||||
return tr("General");
|
||||
case kCategoryDistort:
|
||||
return tr("Distort");
|
||||
case kCategoryMath:
|
||||
return tr("Math");
|
||||
case kCategoryKeying:
|
||||
return tr("Keying");
|
||||
case kCategoryColor:
|
||||
return tr("Color");
|
||||
case kCategoryFilter:
|
||||
@@ -1686,16 +1684,12 @@ QString Node::GetCategoryName(const CategoryID &c)
|
||||
return tr("Timeline");
|
||||
case kCategoryGenerator:
|
||||
return tr("Generator");
|
||||
case kCategoryChannels:
|
||||
return tr("Channel");
|
||||
case kCategoryTransition:
|
||||
return tr("Transition");
|
||||
case kCategoryProject:
|
||||
return tr("Project");
|
||||
case kCategoryVideoEffect:
|
||||
return tr("Video Effect");
|
||||
case kCategoryAudioEffect:
|
||||
return tr("Audio Effect");
|
||||
case kCategoryTime:
|
||||
return tr("Time");
|
||||
case kCategoryUnknown:
|
||||
case kCategoryCount:
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user