overte-org / tivolicloud

The Tivoli interface client and server software
Apache License 2.0
1 stars 0 forks source link

Import 8c90792f61: Reverting custom shader management to original developer>enable procedural materials (by Caitlyn) #419

Open daleglass opened 2 years ago

daleglass commented 2 years ago

This is an automated proposal to look at a commit made by Caitlyn and import it into Overte

Commit: 8c90792f61960dc44af4df144cb8d2ddf23d24b6
Author: Caitlyn
Date: Tue, 05 May 2020 12:10
Reverting custom shader management to original developer>enable procedural materials

Stats:

Filename Stats Lines Added Removed Lines in blame
interface/src/Application.cpp 6 3 3 3
interface/src/Menu.cpp 31 18 13 13
interface/src/Menu.h 4 3 1 1
interface/src/PerformanceManager.cpp 8 4 4 4
interface/src/scripting/RenderScriptingInterface.cpp 74 17 57 3
interface/src/scripting/RenderScriptingInterface.h 54 18 36 7
interface/src/ui/PreferencesDialog.cpp 268 147 121 136
libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp 64 29 35 29
libraries/entities-renderer/src/RenderableShapeEntityItem.cpp 92 44 48 39
libraries/procedural/src/procedural/Procedural.cpp 124 60 64 60
libraries/procedural/src/procedural/Procedural.h 81 41 40 41
libraries/procedural/src/procedural/ProceduralMaterialCache.cpp 95 56 39 56
libraries/procedural/src/procedural/ProceduralSkybox.cpp 14 7 7 7
libraries/qml/src/qml/impl/TextureCache.cpp 1429 1308 121 19
libraries/qml/src/qml/impl/TextureCache.h 283 230 53 5
libraries/render-utils/src/MeshPartPayload.cpp 184 95 89 87
libraries/render-utils/src/MeshPartPayload.h 75 49 26 48
17 files - 2886 2129 757 558

To work on this, please assign the issue to yourself, then look at the commit and decide whether this would be a good addition to Overte.

Useful commits should be submitted as a PR against Overte. Tag this issue in PR, so that it's automatically closed once the PR is merged.

You can cherry-pick this issue with this command:

git cherry-pick 8c90792f61960dc44af4df144cb8d2ddf23d24b6