diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
index 8a790cee46..0b64429d15 100644
--- a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
+++ b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
@@ -145,7 +145,7 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater
* "hifi_pbr"
model only.
* @property {string} opacityMapMode - The mode defining the interpretation of the opacity map. Values can be:
*
"OPACITY_MAP_OPAQUE"
for ignoring the opacityMap
information."OPACITY_MAP_OPAQUE"
for ignoring the opacity map information."OPACITY_MAP_MASK"
for using the opacityMap
as a mask, where only the texel greater
* than opacityCutoff
are visible and rendered opaque."OPACITY_MAP_BLEND"
for using the opacityMap
for alpha blending the material surface
@@ -153,14 +153,14 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater
* "fallthrough"
to fall through to the material below. "hifi_pbr"
model only.
* @property {number|string} opacityCutoff - The opacity cutoff threshold used to determine the opaque texels of the
- * opacityMap
when opacityMapMode
is "OPACITY_MAP_MASK"
, range 0.0
+ * opacityMap
when opacityMapMode
is "OPACITY_MAP_MASK"
. Range 0.0
* – 1.0
.
* Set to "fallthrough"
to fall through to the material below. "hifi_pbr"
model only.
- * @property {string} cullFaceMode - The mode defining which side of the geometry should be rendered. Values can be:
+ * @property {string} cullFaceMode="CULL_BACK" - The mode defining which side of the geometry should be rendered. Values can be:
* "CULL_NONE"
for rendering both sides of the geometry."CULL_FRONT"
for culling the front faces of the geometry."CULL_BACK"
(the default) for culling the back faces of the geometry."CULL_NONE"
to render both sides of the geometry."CULL_FRONT"
to cull the front faces of the geometry."CULL_BACK"
(the default) to cull the back faces of the geometry."fallthrough"
to fall through to the material below. "hifi_pbr"
model only.
* @property {string} roughnessMap - The URL of the roughness texture image. You can use this or glossMap
, but not
diff --git a/libraries/script-engine/src/AssetScriptingInterface.cpp b/libraries/script-engine/src/AssetScriptingInterface.cpp
index 33be9de2ad..f088ad7a38 100644
--- a/libraries/script-engine/src/AssetScriptingInterface.cpp
+++ b/libraries/script-engine/src/AssetScriptingInterface.cpp
@@ -419,7 +419,7 @@ void AssetScriptingInterface::compressData(QScriptValue options, QScriptValue sc
* false
to upload and store the data without gzip compression. Synonym: compressed
.
* @property {string|ArrayBuffer} data - The content to upload.
* @property {string} [path] - A user-friendly path for the file in the asset server. May have a leading
- * "atp:"
. IF not specified, no path-to-hash mapping is set.
+ * "atp:"
. If not specified, no path-to-hash mapping is set.
* Note: The asset server destroys any unmapped SHA256-named file at server restart. Either set the mapping path * with this property or use {@link Assets.setMapping} to set a path-to-hash mapping for the uploaded file.
*/ diff --git a/libraries/shared/src/RegisteredMetaTypes.h b/libraries/shared/src/RegisteredMetaTypes.h index 3b47bb70c6..0a60f2872a 100644 --- a/libraries/shared/src/RegisteredMetaTypes.h +++ b/libraries/shared/src/RegisteredMetaTypes.h @@ -688,6 +688,7 @@ using MeshPointer = std::shared_ptr