diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-10 09:01:54 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-08-10 09:01:54 +0300 |
| commit | 34d8200d0f0dde1b8205c802edbb08cc1ff503b2 (patch) | |
| tree | 64cc14f3bd070b4f976b3ff280aefb731f01d66a /indra/llrender | |
| parent | c2660070ce5a81270d72feeea8939e9c0368360e (diff) | |
DRTVWR-493 LLRender2D init cleanup
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrender2dutils.cpp | 5 | ||||
| -rw-r--r-- | indra/llrender/llrender2dutils.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/llrender/llrender2dutils.cpp b/indra/llrender/llrender2dutils.cpp index 1a7c4144ed..0467321e3b 100644 --- a/indra/llrender/llrender2dutils.cpp +++ b/indra/llrender/llrender2dutils.cpp @@ -1565,10 +1565,9 @@ void gl_segmented_rect_3d_tex(const LLRectf& clip_rect, const LLRectf& center_uv } -LLRender2D::LLRender2D(LLImageProviderInterface* image_provider, - const LLVector2* scale_factor) +LLRender2D::LLRender2D(LLImageProviderInterface* image_provider) { - mGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor; + mGLScaleFactor = LLVector2(1.f, 1.f); mImageProvider = image_provider; } diff --git a/indra/llrender/llrender2dutils.h b/indra/llrender/llrender2dutils.h index 4e4696be41..f2640ff998 100644 --- a/indra/llrender/llrender2dutils.h +++ b/indra/llrender/llrender2dutils.h @@ -123,7 +123,7 @@ class LLImageProviderInterface; class LLRender2D : public LLParamSingleton<LLRender2D> { - LLPARAMSINGLETON(LLRender2D, LLImageProviderInterface* image_provider, const LLVector2* scale_factor); + LLPARAMSINGLETON(LLRender2D, LLImageProviderInterface* image_provider); LOG_CLASS(LLRender2D); ~LLRender2D(); public: |