Skip to content

Commit b78f806

Browse files
ludovic-theobaldEvergreen
authored andcommitted
[VFX] Avoid serializing the "model" Object in VFXEditorTaskDesc
1 parent fea32db commit b78f806

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Packages/com.unity.visualeffectgraph/Editor/Data/VFXDataMesh.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public override void FillDescs(
150150
shaderSourceIndex = -1,
151151
values = mappings.ToArray(),
152152
type = (UnityEngine.VFX.VFXTaskType)VFXTaskType.Output,
153-
model = context
153+
modelId = context.GetEntityId()
154154
};
155155

156156
mappings.Clear();

Packages/com.unity.visualeffectgraph/Editor/Data/VFXDataParticle.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@ int GetBufferIndex(VFXTask task, string baseName)
14441444
taskDesc.parameters = cpuMappings.Concat(contextData.parameters).Concat(additionalParameters).ToArray();
14451445
taskDesc.instanceSplitIndex = AddInstanceSplitDesc(instanceSplitDescs, instancingSplitDescValues);
14461446
taskDesc.shaderSourceIndex = compiledData.taskToCompiledData[task].indexInShaderSource;
1447-
taskDesc.model = context;
1447+
taskDesc.modelId = context.GetEntityId();
14481448
taskDesc.usesMaterialVariant = compilationMode == VFXCompilationMode.Edition && context.usesMaterialVariantInEditMode;
14491449

14501450
if (context is IVFXMultiMeshOutput multiMeshOutput && multiMeshOutput.meshCount > 0) // If the context is a multi mesh output, split and patch task desc into several tasks
@@ -1477,7 +1477,7 @@ int GetBufferIndex(VFXTask task, string baseName)
14771477
sortTaskDesc.type = UnityEngine.VFX.VFXTaskType.PerOutputSort;
14781478
sortTaskDesc.processor = null;
14791479
sortTaskDesc.shaderSourceIndex = -1;
1480-
sortTaskDesc.model = context;
1480+
sortTaskDesc.modelId = context.GetEntityId();
14811481

14821482
sortTaskDesc.buffers = new VFXMapping[3];
14831483
sortTaskDesc.buffers[0] = new VFXMapping("srcBuffer", GetBufferIndex(task, k_IndirectBufferName) + j);

Packages/com.unity.visualeffectgraph/Editor/Models/VFXGraph.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using UnityEngine;
1313
using UnityEngine.VFX;
1414
using UnityEngine.Profiling;
15-
15+
using Object = System.Object;
1616
using UnityObject = UnityEngine.Object;
1717

1818
namespace UnityEditor.VFX
@@ -1536,7 +1536,7 @@ internal UnityObject[] CompileAndUpdateAsset(VisualEffectAsset asset)
15361536
}
15371537

15381538
//OnSetupMaterial equivalent
1539-
var model = task.model;
1539+
var model = EditorUtility.EntityIdToObject(task.modelId);
15401540
if (model is IVFXSubRenderer subRenderer)
15411541
{
15421542
subRenderer.SetupMaterial(writableMaterial);

0 commit comments

Comments
 (0)