Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.

Material IO Fixes #10480

Merged
merged 5 commits into from
Jun 28, 2024
Merged

Material IO Fixes #10480

merged 5 commits into from
Jun 28, 2024

Conversation

dinomut1
Copy link
Contributor

Several fixes to material system that arose when integrating vertex color lerping material.

  • Change EEMaterialImporter extension to be first in the extension list so it beats the default MeshPhysicalMaterial parser extension to define materials
  • Force material update on editing properties in material editor to automatically propagate all changes in material
  • Fix issue in material library system where imported materials are getting instantiated twice
  • Add a couple more sections where material.userData.type is preferred over material.type

fix materials getting instantiated twice on import
fix updating material properties in material editor
@AidanCaruso
Copy link
Contributor

This looks good, I'll be QA testing shortly.

@dinomut1 dinomut1 enabled auto-merge June 28, 2024 22:06
@dinomut1 dinomut1 added this pull request to the merge queue Jun 28, 2024
@dinomut1 dinomut1 removed this pull request from the merge queue due to a manual request Jun 28, 2024
@dinomut1 dinomut1 added this pull request to the merge queue Jun 28, 2024
Merged via the queue into dev with commit b577c94 Jun 28, 2024
25 checks passed
@dinomut1 dinomut1 deleted the material-io-fixes branch June 28, 2024 22:34
MbfloydIR added a commit that referenced this pull request Jul 2, 2024
* dev: (21 commits)
  show grid lines by default in studio (#10500)
  Fix xrui pointer input & improved follow camera  (#10471)
  feat: zendesk widget in viewer app & custom button (#10494)
  fix the download project button (#10499)
  studio: titles of some elements on components are not properly displayed (camelcased or lowercased) (#10491)
  fix slider ui (#10490)
  add point light name (#10495)
  upload from assets panel (#10487)
  IR-2838-Studio-Click-Selection-Regression (#10479)
  Add better error to file-browser patch (#10489)
  Fixed issue with HLS streams not playing (#10485)
  IR-2810: Redesign Compress Menu (#10469)
  studio: fix context menu (#10475)
  fix(IR-2799): fix feature flags state (#10453)
  fix WebXR (#10484)
  IR-2727: Zendesk authentication (#10452)
  Assets must populate from all projects you have perms for (#10409)
  image convert modal (#10466)
  clean out userdata after initializing ecs data from gltfs (#10470)
  Material IO Fixes (#10480)
  ...

# Conflicts:
#	packages/common/src/utils/getAllStringValueNodes.ts
#	packages/engine/src/avatar/systems/AvatarCameraInputSystem.ts
#	packages/spatial/src/camera/components/FollowCameraComponent.ts
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants