summaryrefslogtreecommitdiffstats
path: root/src/render/WaterLevel.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-20 14:39:38 +0200
committeraap <aap@papnet.eu>2019-07-20 14:39:38 +0200
commit60045ec6cd5fe5bd650cf62442283e50d4a4c233 (patch)
tree40844313ea09daa35f96c8b7da7c1ba3a6d302e6 /src/render/WaterLevel.cpp
parentMerge pull request #149 from ShFil119/audio4 (diff)
downloadre3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.gz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.bz2
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.lz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.xz
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.tar.zst
re3-60045ec6cd5fe5bd650cf62442283e50d4a4c233.zip
Diffstat (limited to 'src/render/WaterLevel.cpp')
-rw-r--r--src/render/WaterLevel.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/render/WaterLevel.cpp b/src/render/WaterLevel.cpp
index 2f994132..30be88e1 100644
--- a/src/render/WaterLevel.cpp
+++ b/src/render/WaterLevel.cpp
@@ -173,9 +173,8 @@ CWaterLevel::CreateWavyAtomic()
{
wavyMorphTarget = RpGeometryGetMorphTarget(wavyGeometry, 0);
- wavyVert = RpMorphTargetGetVertices(wavyMorphTarget);
-
ASSERT(wavyMorphTarget != NULL);
+ wavyVert = RpMorphTargetGetVertices(wavyMorphTarget);
ASSERT(wavyVert != NULL);
for ( int32 i = 0; i < 9; i++ )
@@ -1149,10 +1148,10 @@ CWaterLevel::AllocateBoatWakeArray()
ASSERT(ms_pWavyAtomic != NULL );
RpGeometry *wavyGeometry = RpAtomicGetGeometry(ms_pWavyAtomic);
+ ASSERT(wavyGeometry != NULL );
RpMorphTarget *wavyMorphTarget = RpGeometryGetMorphTarget(wavyGeometry, 0);
RpMaterial *wavyMaterial = RpGeometryGetMaterial(wavyGeometry, 0);
- ASSERT(wavyGeometry != NULL );
ASSERT(wavyMorphTarget != NULL );
ASSERT(wavyMaterial != NULL );