Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/draco/dracoenc/src/draco/compression/encode_base.h')
-rw-r--r--extern/draco/dracoenc/src/draco/compression/encode_base.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/extern/draco/dracoenc/src/draco/compression/encode_base.h b/extern/draco/dracoenc/src/draco/compression/encode_base.h
index fa263f8fa3d..451d970eb6f 100644
--- a/extern/draco/dracoenc/src/draco/compression/encode_base.h
+++ b/extern/draco/dracoenc/src/draco/compression/encode_base.h
@@ -68,23 +68,28 @@ class EncoderBase {
Status CheckPredictionScheme(GeometryAttribute::Type att_type,
int prediction_scheme) const {
// Out of bound checks:
- if (prediction_scheme < 0)
- return Status(Status::ERROR, "Invalid prediction scheme requested.");
+ if (prediction_scheme < PREDICTION_NONE)
+ return Status(Status::DRACO_ERROR,
+ "Invalid prediction scheme requested.");
if (prediction_scheme >= NUM_PREDICTION_SCHEMES)
- return Status(Status::ERROR, "Invalid prediction scheme requested.");
+ return Status(Status::DRACO_ERROR,
+ "Invalid prediction scheme requested.");
// Deprecated prediction schemes:
if (prediction_scheme == MESH_PREDICTION_TEX_COORDS_DEPRECATED)
- return Status(Status::ERROR,
+ return Status(Status::DRACO_ERROR,
"MESH_PREDICTION_TEX_COORDS_DEPRECATED is deprecated.");
+ if (prediction_scheme == MESH_PREDICTION_MULTI_PARALLELOGRAM)
+ return Status(Status::DRACO_ERROR,
+ "MESH_PREDICTION_MULTI_PARALLELOGRAM is deprecated.");
// Attribute specific checks:
if (prediction_scheme == MESH_PREDICTION_TEX_COORDS_PORTABLE) {
if (att_type != GeometryAttribute::TEX_COORD)
- return Status(Status::ERROR,
+ return Status(Status::DRACO_ERROR,
"Invalid prediction scheme for attribute type.");
}
if (prediction_scheme == MESH_PREDICTION_GEOMETRIC_NORMAL) {
if (att_type != GeometryAttribute::NORMAL) {
- return Status(Status::ERROR,
+ return Status(Status::DRACO_ERROR,
"Invalid prediction scheme for attribute type.");
}
}
@@ -92,7 +97,7 @@ class EncoderBase {
if (att_type == GeometryAttribute::NORMAL) {
if (!(prediction_scheme == PREDICTION_DIFFERENCE ||
prediction_scheme == MESH_PREDICTION_GEOMETRIC_NORMAL)) {
- return Status(Status::ERROR,
+ return Status(Status::DRACO_ERROR,
"Invalid prediction scheme for attribute type.");
}
}