Thomas Mann 501afbd7b8 Merge remote-tracking branch 'origin/dev' into feat/main-merge-dev2 ...

# Conflicts:
#	.Defaults/variations/21b0a346-f214-449f-ae27-7bfbe5395d66.var
#	.Defaults/variations/26bb382c-5e3d-49ae-b17e-5bd49b083d9a.var
#	.Defaults/variations/52d0df91-7464-4fff-9173-72c0ee29fced.var
#	.Defaults/variations/5cf7a1e2-7369-4e74-a7a9-b0eae61bdc21.var
#	.Defaults/variations/a2ea3af5-d78b-46b4-84db-09d31f042798.var
#	.Variations/b5102fba-f05b-43fc-aa1d-613fe1d68ad2.var
#	.gitignore
#	Core/Core.csproj
#	Core/Operator/Symbol.cs
#	Editor/Gui/Graph/Dialogs/RenameInputDialog.cs
#	Editor/Gui/Graph/Graph.cs
#	Editor/Gui/Graph/GraphCanvas.cs
#	Editor/Gui/Graph/GraphWindow.cs
#	Editor/Gui/Graph/Modification/Duplicate.cs
#	Editor/Gui/Graph/OutputNode.cs
#	Editor/Gui/InputUi/CombinedInputs/CurveInputEditing.cs
#	Editor/Gui/InputUi/InputValueUi.cs
#	Editor/Gui/InputUi/VectorInputs/FloatVectorInputValueUi.cs
#	Editor/Gui/Interaction/CurveEditPopup.cs
#	Editor/Gui/Interaction/ScalableCanvas.cs
#	Editor/Gui/Interaction/WithCurves/CurveEditCanvas.cs
#	Editor/Gui/Interaction/WithCurves/CurveEditing.cs
#	Editor/Gui/OutputUi/DataSetViewCanvas.cs
#	Editor/Gui/Styling/CustomComponents.cs
#	Editor/Gui/Styling/FormInputs.cs
#	Editor/Gui/Styling/InputWithTypeAheadSearch.cs
#	Editor/Gui/T3UI.cs
#	Editor/Gui/UiHelpers/Helpers.cs
#	Editor/Gui/Windows/OperatorHelp.cs
#	Editor/Gui/Windows/Output/OutputWindow.cs
#	Editor/Gui/Windows/ParameterSettings.cs
#	Editor/Gui/Windows/ParameterWindow.cs
#	Editor/Gui/Windows/SettingsWindow.cs
#	Editor/Gui/Windows/TimeLine/DopeSheetArea.cs
#	Editor/Gui/Windows/TimeLine/LayersArea.cs
#	Editor/Gui/Windows/TimeLine/TimeLineCanvas.cs
#	Editor/Gui/Windows/Window.cs
#	Editor/Program.cs
#	Editor/UiContentUpdate.cs
#	Editor/UiModel/UiModel.TypeRegistration.cs
#	Editor/UiModel/UiSymbolData.cs
#	Editor/UiModel/UiSymbolJson.cs
#	Operators/Lib/Lib/_3d/transform/CameraWithRotation.cs
#	Operators/Lib/Lib/img/generate/NGonGradient.cs
#	Operators/Lib/Resources/img/analyze/cs-GetImageBrightness.hlsl
#	Operators/Lib/Resources/img/fx/Sharpen.hlsl
#	Operators/Lib/Resources/particles/FollowMeshSurfaceForce.hlsl
#	Operators/Lib/Resources/points/modify/SetPointAttributesWithPointFields.hlsl
#	Operators/Lib/Resources/points/sim/sim-point-movement.hlsl
#	Operators/Lib/_3d/_/_ReadIntFromGpuBuffer.cs
#	Operators/Lib/_3d/_/_ReadIntFromGpuBuffer_11ebbb25-984a-4772-b720-b8c7e5214a83.t3
#	Operators/Lib/_3d/_/_ReadIntFromGpuBuffer_11ebbb25-984a-4772-b720-b8c7e5214a83.t3ui
#	Operators/Lib/_3d/draw/DrawMeshChunksAtPoints.cs
#	Operators/Lib/_3d/draw/DrawMeshChunksAtPoints_0e313329-74fb-4f2a-b1c2-136e1ecf9b3e.t3
#	Operators/Lib/_3d/draw/DrawMeshChunksAtPoints_0e313329-74fb-4f2a-b1c2-136e1ecf9b3e.t3ui
#	Operators/Lib/_3d/draw/DustParticles.t3
#	Operators/Lib/_3d/draw/Layer2d.t3
#	Operators/Lib/_3d/draw/Layer2d.t3ui
#	Operators/Lib/_3d/mesh/_/_MeshBufferComponents.cs
#	Operators/Lib/_3d/mesh/modify/CollapseVertices.cs
#	Operators/Lib/_3d/mesh/modify/CollapseVertices_52d0df91-7464-4fff-9173-72c0ee29fced.t3
#	Operators/Lib/_3d/mesh/modify/CollapseVertices_52d0df91-7464-4fff-9173-72c0ee29fced.t3ui
#	Operators/Lib/_3d/mesh/modify/MeshProjectUV.t3
#	Operators/Lib/_3d/postfx/SSAO.t3
#	Operators/Lib/dx11/_/_ImageFxShaderSetupStatic.t3
#	Operators/Lib/dx11/buffer/IntsToBufferWithViews.cs
#	Operators/Lib/dx11/buffer/IntsToBufferWithViews_c036b4f2-97bf-40f1-b4d5-c2067a4fa97f.t3
#	Operators/Lib/dx11/buffer/IntsToBufferWithViews_c036b4f2-97bf-40f1-b4d5-c2067a4fa97f.t3ui
#	Operators/Lib/dx11/draw/_internal/_GetSceneDefinitionPoints.cs
#	Operators/Lib/dx11/draw/_internal/_GetSceneDefinitionPoints_5b127401-600c-4247-9d59-2f6ff359ba85.t3
#	Operators/Lib/dx11/draw/_internal/_GetSceneDefinitionPoints_5b127401-600c-4247-9d59-2f6ff359ba85.t3ui
#	Operators/Lib/img/adjust/ColorGrade.t3
#	Operators/Lib/img/adjust/TransformImage.cs
#	Operators/Lib/img/analyze/GetImageBrightness.cs
#	Operators/Lib/img/analyze/GetImageBrightness_787f44a8-8c51-4cfa-a7d5-7014d11b6a28.t3
#	Operators/Lib/img/analyze/GetImageBrightness_787f44a8-8c51-4cfa-a7d5-7014d11b6a28.t3ui
#	Operators/Lib/img/fx/Sharpen.cs
#	Operators/Lib/img/fx/Sharpen_4b207e35-64b4-4833-977c-da6c7154a081.t3
#	Operators/Lib/img/fx/Sharpen_4b207e35-64b4-4833-977c-da6c7154a081.t3ui
#	Operators/Lib/img/use/RenderWithMotionBlur.t3
#	Operators/Lib/io/input/Gamepad.cs
#	Operators/Lib/io/input/Gamepad_d69e0f2e-8fe2-478b-ba4e-2a55a92670ae.t3
#	Operators/Lib/io/input/Gamepad_d69e0f2e-8fe2-478b-ba4e-2a55a92670ae.t3ui
#	Operators/Lib/io/midi/MidiControlOutput.cs
#	Operators/Lib/io/midi/MidiControlOutput_a59c583b-dbc2-495c-a9b1-e64fc1e5d532.t3
#	Operators/Lib/io/midi/MidiControlOutput_a59c583b-dbc2-495c-a9b1-e64fc1e5d532.t3ui
#	Operators/Lib/io/midi/MidiNoteOutput.cs
#	Operators/Lib/io/midi/MidiNoteOutput_642cec4f-d4e0-4d0a-8dc3-6ca8339b5f89.t3
#	Operators/Lib/io/midi/MidiNoteOutput_642cec4f-d4e0-4d0a-8dc3-6ca8339b5f89.t3ui
#	Operators/Lib/io/midi/MidiPitchbendOutput.cs
#	Operators/Lib/io/midi/MidiPitchbendOutput_01d33d21-d75e-4c22-bfe6-088e1ee4a5e8.t3
#	Operators/Lib/io/midi/MidiPitchbendOutput_01d33d21-d75e-4c22-bfe6-088e1ee4a5e8.t3ui
#	Operators/Lib/io/midi/MidiTriggerOutput.cs
#	Operators/Lib/io/midi/MidiTriggerOutput_61c11adb-94f0-4dc7-9611-c22c40709cf4.t3
#	Operators/Lib/io/midi/MidiTriggerOutput_61c11adb-94f0-4dc7-9611-c22c40709cf4.t3ui
#	Operators/Lib/io/midi/SelectBoolFromFloatDict.cs
#	Operators/Lib/io/midi/SelectBoolFromFloatDict_05295c65-7dfd-4570-866e-9b5c4e735569.t3
#	Operators/Lib/io/midi/SelectBoolFromFloatDict_05295c65-7dfd-4570-866e-9b5c4e735569.t3ui
#	Operators/Lib/point/draw/ChunkInstancingExample.cs
#	Operators/Lib/point/draw/ChunkInstancingExample_76cd7578-0f97-49a6-938a-caeaa98deaac.t3
#	Operators/Lib/point/draw/ChunkInstancingExample_76cd7578-0f97-49a6-938a-caeaa98deaac.t3ui
#	Operators/Lib/point/draw/DrawPoints.t3
#	Operators/Lib/point/helper/_VisualizePointFields.cs
#	Operators/Lib/point/helper/_VisualizePointFields_a53a0643-8daa-49c2-9c8c-34cfe5ad8030.t3
#	Operators/Lib/point/helper/_VisualizePointFields_a53a0643-8daa-49c2-9c8c-34cfe5ad8030.t3ui
#	Operators/Lib/point/modify/SelectPoints.t3
#	Operators/Lib/point/modify/SetAttributesWithPointFields.cs
#	Operators/Lib/point/modify/SetAttributesWithPointFields_21b0a346-f214-449f-ae27-7bfbe5395d66.t3
#	Operators/Lib/point/modify/SetAttributesWithPointFields_21b0a346-f214-449f-ae27-7bfbe5395d66.t3ui
#	Operators/Lib/point/modify/SpreadPointAttributes.t3
#	Operators/Lib/point/particle/force/FollowMeshSurfaceForce.cs
#	Operators/Lib/point/particle/force/FollowMeshSurfaceForce_26bb382c-5e3d-49ae-b17e-5bd49b083d9a.t3
#	Operators/Lib/point/particle/force/FollowMeshSurfaceForce_26bb382c-5e3d-49ae-b17e-5bd49b083d9a.t3ui
#	Operators/Lib/point/particle/force/VolumeForce.cs
#	Operators/Ndi/NdiInput.cs
#	Operators/Ndi/NdiOutput.cs
#	Operators/Ndi/NdiOutput_9412d0f4-dab8-4145-9719-10395e154fa7.t3
#	Operators/Ndi/NdiOutput_9412d0f4-dab8-4145-9719-10395e154fa7.t3ui
#	Operators/Operators.csproj
#	Operators/Types/lib/img/video/PlayVideo.cs
#	Operators/Types/t3/operators/types/ScreenCapture.cs
#	Operators/Types/user/pixtur/PixiShow.cs
#	Operators/Types/user/pixtur/Pulsarium/Pulsarium.cs
#	Operators/Types/user/pixtur/Pulsarium/Pulsarium_198321f6-3aa4-42ad-a34f-b39e02fe314b.t3
#	Operators/Types/user/pixtur/Pulsarium/Pulsarium_198321f6-3aa4-42ad-a34f-b39e02fe314b.t3ui
#	Operators/Types/user/pixtur/research/hitform/LoadHFCSExample_6f3d09b4-5b3e-44cf-b023-7db157682897.t3
#	Operators/examples/Resources/user/newemka980/img/generate/WorleyNoise.hlsl
#	Operators/examples/lib/_3d/_/ReprojectToUvExample.t3
#	Operators/examples/lib/_3d/postfx/MotionBlurExample2.cs
#	Operators/examples/lib/_3d/postfx/MotionBlurExample2_9a7063ee-abde-45b0-b3f0-73a12721488f.t3
#	Operators/examples/lib/_3d/postfx/MotionBlurExample2_9a7063ee-abde-45b0-b3f0-73a12721488f.t3ui
#	Operators/examples/lib/img/fx/ReactionDiffusionExample.cs
#	Operators/examples/lib/img/fx/ReactionDiffusionExample_ddf3077b-6273-4023-88e5-2948312e012b.t3
#	Operators/examples/lib/img/fx/ReactionDiffusionExample_ddf3077b-6273-4023-88e5-2948312e012b.t3ui
#	Operators/examples/lib/img/fx/SharpenExample.cs
#	Operators/examples/lib/img/fx/SharpenExample_eccd22ed-1a59-4655-b811-10790871cd4c.t3
#	Operators/examples/lib/img/fx/SharpenExample_eccd22ed-1a59-4655-b811-10790871cd4c.t3ui
#	Operators/examples/lib/img/generate/WorleyNoiseExample.cs
#	Operators/examples/lib/img/generate/WorleyNoiseExample_e3c3942b-451e-4e71-b6d8-ca5a6acd7ce1.t3
#	Operators/examples/lib/img/generate/WorleyNoiseExample_e3c3942b-451e-4e71-b6d8-ca5a6acd7ce1.t3ui
#	Operators/examples/lib/io/GamePadExample.cs
#	Operators/examples/lib/io/GamePadExample_025285fd-c00f-44c7-8698-363ccc763fa1.t3
#	Operators/examples/lib/io/GamePadExample_025285fd-c00f-44c7-8698-363ccc763fa1.t3ui
#	Operators/examples/lib/io/midi/MidiNoteOutputExample.cs
#	Operators/examples/lib/io/midi/MidiNoteOutputExample_cb2cdd1d-811a-4a30-a5bc-289f36c31028.t3
#	Operators/examples/lib/io/midi/MidiNoteOutputExample_cb2cdd1d-811a-4a30-a5bc-289f36c31028.t3ui
#	Operators/examples/lib/point/BoundingBoxPointsExample.t3
#	Operators/examples/t3/CamPositionExample.t3
#	Operators/examples/user/_1x/LookTest09.t3
#	Operators/examples/user/newemka980/Examples/SpringVec3Example.t3
#	Operators/examples/user/still/katsu/Katsumaki.t3
#	Operators/examples/user/still/katsu/_KatsumakiResearch.t3
#	Operators/examples/user/still/there/ThereDemo.t3
#	Operators/examples/user/still/worksforeverybody/scenes/_WFE_MainPart1.t3
#	Operators/examples/user/still/worksforeverybody/scenes/_WfeFinalPart.t3
#	Operators/examples/user/wake/livecoding/LiveCodingVideoComposition.t3
#	Operators/examples/user/wake/livecoding/helpers/FadingSlideShowSoftEdge.cs
#	Operators/examples/user/wake/livecoding/helpers/FadingSlideShowSoftEdge_92750028-5fac-4e6d-84fe-f779f6d0ae33.t3
#	Operators/examples/user/wake/livecoding/helpers/FadingSlideShowSoftEdge_92750028-5fac-4e6d-84fe-f779f6d0ae33.t3ui
#	Operators/user/pixtur/BirdDinos/BirdDinos.t3
#	Operators/user/pixtur/Resources/research/Gltf/instancing-test-v01.glb
#	Operators/user/pixtur/research/gltf/LoadGltfScene.cs
#	Operators/user/pixtur/research/hitform/LoadHFCSExample.t3ui
#	Operators/user/pixtur/research/lensflares/MakeLensFlareAtlas.t3
#	Operators/user/pixtur/vj/VJDeadlineAnimals.t3
#	Operators/user/pixtur/vj/VJDeadlineAnimals.t3ui
#	Operators/user/pixtur/vj/scenes/CutOffShapes.t3
#	Operators/user/pixtur/vj/scenes/VJAcidCats.t3
#	Operators/user/pixtur/vj/scenes/VJFaceBlobs.t3
#	Operators/user/pixtur/vj/scenes/VJFraeser.t3
#	Operators/user/pixtur/vj/scenes/VJLineChurches.t3
#	Operators/user/pixtur/vj/scenes/VJMovieCuts.t3
#	Operators/user/pixtur/vj/scenes/VJRepetitionTunnel.t3
#	Operators/user/pixtur/vj/scenes/VJSkullScene.t3
#	projectSettings.json

2024-09-14 20:39:47 +02:00

..

b5102fba-f05b-43fc-aa1d-613fe1d68ad2.var

Merge remote-tracking branch 'origin/dev' into feat/main-merge-dev2

2024-09-14 20:39:47 +02:00