diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
| commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
| tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/llrender/llrender.cpp | |
| parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
| parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) | |
Pull from viewer-experience
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index cd827f5091..b0ddacbb05 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -997,7 +997,7 @@ void LLLightState::setSpotDirection(const LLVector3& direction) const glh::matrix4f& mat = gGL.getModelviewMatrix(); mat.mult_matrix_dir(dir); - mSpotDirection.set(direction); + mSpotDirection.set(dir.v); } } @@ -1434,6 +1434,8 @@ void LLRender::loadIdentity() flush(); { + llassert_always(mMatrixMode < NUM_MATRIX_MODES) ; + mMatrix[mMatrixMode][mMatIdx[mMatrixMode]].make_identity(); mMatHash[mMatrixMode]++; } |