Merge remote-tracking branch 'origin/master' into 1.9

This commit is contained in:
Wojtek Figat
2024-08-23 00:05:00 +02:00
20 changed files with 225 additions and 46 deletions

View File

@@ -289,9 +289,9 @@ void DrawEmitterCPU(RenderContext& renderContext, ParticleBuffer* buffer, DrawCa
// Check if need to setup ribbon modules
int32 ribbonModuleIndex = 0;
int32 ribbonModulesDrawIndicesPos = 0;
int32 ribbonModulesDrawIndicesStart[PARTICLE_EMITTER_MAX_RIBBONS];
int32 ribbonModulesDrawIndicesCount[PARTICLE_EMITTER_MAX_RIBBONS];
int32 ribbonModulesSegmentCount[PARTICLE_EMITTER_MAX_RIBBONS];
int32 ribbonModulesDrawIndicesStart[PARTICLE_EMITTER_MAX_RIBBONS] = {};
int32 ribbonModulesDrawIndicesCount[PARTICLE_EMITTER_MAX_RIBBONS] = {};
int32 ribbonModulesSegmentCount[PARTICLE_EMITTER_MAX_RIBBONS] = {};
if (emitter->Graph.RibbonRenderingModules.HasItems())
{
// Prepare ribbon data