Fix (harmless) use of uninitialized variables in Cycles

2 files changed, 10 insertions, 1 deletions

diff --git a/intern/cycles/render/background.cpp b/intern/cycles/render/background.cpp
index 5a61ead2c54..25ec0d3f0ba 100644
--- a/intern/cycles/render/background.cpp
+++ b/intern/cycles/render/background.cpp
@@ -53,6 +53,7 @@ NODE_DEFINE(Background)
 Background::Background() : Node(node_type)
 {
   need_update = true;
+  shader = NULL;
 }
 
 Background::~Background()
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 77c66779c20..e827a424c3c 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -85,7 +85,15 @@ DeviceScene::DeviceScene(Device *device)
 }
 
 Scene::Scene(const SceneParams &params_, Device *device)
-    : name("Scene"), device(device), dscene(device), params(params_)
+    : name("Scene"),
+      default_surface(NULL),
+      default_volume(NULL),
+      default_light(NULL),
+      default_background(NULL),
+      default_empty(NULL),
+      device(device),
+      dscene(device),
+      params(params_)
 {
   memset((void *)&dscene.data, 0, sizeof(dscene.data));