diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-05-24 13:45:26 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-25 19:51:16 +0000 |
| commit | 7793c707b985efc14a5675d344fdca83128059ba (patch) | |
| tree | d453b9227d34c37a6509c0a55625e27f705fe657 /src/render/lights/qabstractlight.cpp | |
| parent | cc8cc05f873aa64ee3c4e1ea6e7a662b15c57723 (diff) | |
Initialize dynamic properties of lights
Forces them to be initialized so they exist when the property reader
is used for later updates.
Also use correct type in default value setting of uniforms.
Task-number: QTBUG-53585
Change-Id: Id594670ea75385c1d54f06d4d7c6241d77403ce6
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/lights/qabstractlight.cpp')
| -rw-r--r-- | src/render/lights/qabstractlight.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index 0f8e5c19f..ea8fd13d6 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -59,6 +59,8 @@ QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight::Type type) , m_shaderData(new QShaderData) { m_shaderData->setProperty("type", type); + m_shaderData->setProperty("color", QColor(Qt::white)); + m_shaderData->setProperty("intensity", 0.5f); } QAbstractLightPrivate::~QAbstractLightPrivate() |