Merge pull request #5968 from penpot/ladybenko-fix-sampling-options-merge

🐛 Fix messed up rebase re: sampling options

render-wasm/src/render.rs

@@ -68,6 +68,7 @@ pub(crate) struct RenderState {
     // Stack of nodes pending to be rendered.
     pub pending_nodes: Vec<NodeRenderState>,
     pub render_complete: bool,
+    pub sampling_options: skia::SamplingOptions,
 }
 
 impl RenderState {
@@ -100,6 +101,7 @@ impl RenderState {
             render_in_progress: false,
             pending_nodes: vec![],
             render_complete: true,
+            sampling_options,
         }
     }