summaryrefslogtreecommitdiff
path: root/libs/rs/rsMesh.cpp
diff options
context:
space:
mode:
author Alex Sakhartchouk <alexst@google.com> 2010-06-04 10:10:24 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-06-04 10:10:24 -0700
commit0829f0d51f73b529a018b9afd931d01711db2f89 (patch)
tree05b9677a884c74e3c1cb9cbc4050f59310aabd5e /libs/rs/rsMesh.cpp
parent4a575c682bae734338e1b8fd64886b0f29b960e4 (diff)
parentaae74ad6144470c66e72b075ac3afeddb186fa98 (diff)
Merge "Creating the jni and java layer to integrate a3d"
Diffstat (limited to 'libs/rs/rsMesh.cpp')
-rw-r--r--libs/rs/rsMesh.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsMesh.cpp b/libs/rs/rsMesh.cpp
index b51e28a4c1bd..bd9cd275999c 100644
--- a/libs/rs/rsMesh.cpp
+++ b/libs/rs/rsMesh.cpp
@@ -107,8 +107,8 @@ void Mesh::serialize(OStream *stream) const
Mesh *Mesh::createFromStream(Context *rsc, IStream *stream)
{
// First make sure we are reading the correct object
- A3DClassID classID = (A3DClassID)stream->loadU32();
- if(classID != A3D_CLASS_ID_MESH) {
+ RsA3DClassID classID = (RsA3DClassID)stream->loadU32();
+ if(classID != RS_A3D_CLASS_ID_MESH) {
LOGE("mesh loading skipped due to invalid class id");
return NULL;
}