diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-04-29 16:34:36 +0300 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2019-05-02 13:14:38 +0000 |
| commit | ccc70e48e576c0dffc289df4850a909fb6fef83d (patch) | |
| tree | 4fccc861832cfe6b7174f463012640ac4f97bd8b /src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h | |
| parent | a007e67eb90da23286728b5c21bf6c786ffc80ae (diff) | |
Allow subpresentations as textures for custom materials and effects
Effects already supported taking the subpresentation as a texture in
the runtime. That behavior is now copied by the custom materials.
This also fixes a runtime bug where the subpresentation was rendered
only if a default material already had the subpresentation as a texture.
Now custom material and effect properties are iterated prior rendering
If they contain subpresentations, those are added the to the render task
list.
Task-number: QT3DS-3165
Change-Id: I7bddec2fece442065d517320d0e381eba5f1b159
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h')
| -rw-r--r-- | src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h index dce9a95a..c498c7ee 100644 --- a/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h +++ b/src/Runtime/Source/runtimerender/Qt3DSRenderRenderList.h @@ -118,4 +118,4 @@ namespace render { } } -#endif
\ No newline at end of file +#endif |