Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

DMDesign
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

0142e5c4

Commit 0142e5c4 authored 9 years ago by Amanda Ghassaei

Downloads
- Patches
- Plain Diff

adding in composites again

parent 63107f04

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

js/lattice/CompositeEditorLattice.js 1 addition, 1 deletion

js/lattice/CompositeEditorLattice.js
js/lattice/LatticeBase.js 2 additions, 1 deletion

js/lattice/LatticeBase.js
js/main.js 1 addition, 0 deletions

js/main.js
js/materials/DMACompositeMaterial.js 17 additions, 6 deletions

js/materials/DMACompositeMaterial.js
js/materials/DMAMaterials.js 24 additions, 33 deletions

js/materials/DMAMaterials.js
js/menus/templates/MaterialMenuView.html 0 additions, 1 deletion

js/menus/templates/MaterialMenuView.html
js/models/AppState.js 2 additions, 3 deletions

js/models/AppState.js

with 47 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment