Merge pull request #2758 from fieldOfView/feature_mesh_types

Improved mesh type UX (Per Model Settings)
This commit is contained in:
ChrisTerBeke 2017-11-29 13:24:38 +01:00 committed by GitHub
commit 0668f80792
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 168 additions and 42 deletions

View file

@ -111,6 +111,7 @@ u_modelMatrix = model_matrix
u_viewProjectionMatrix = view_projection_matrix
u_normalMatrix = normal_matrix
u_lightPosition = light_0_position
u_diffuseColor = diffuse_color
[attributes]
a_vertex = vertex

View file

@ -266,6 +266,7 @@
"model_unslicable": [122, 122, 122, 255],
"model_unslicable_alt": [172, 172, 127, 255],
"model_selection_outline": [12, 169, 227, 255],
"model_non_printing": [122, 122, 122, 255],
"xray": [26, 26, 62, 255],
"xray_error": [255, 0, 0, 255],