[Bf-blender-cvs] [6bfe7c7a02b] master: Fix (harmless) use of uninitialized variables in Cycles
Brecht Van Lommel
noreply at git.blender.org
Wed Mar 18 20:04:49 CET 2020
Commit: 6bfe7c7a02bd27b155990efdd51d0984d9619ce9
Author: Brecht Van Lommel
Date: Wed Mar 18 17:54:24 2020 +0100
Branches: master
https://developer.blender.org/rB6bfe7c7a02bd27b155990efdd51d0984d9619ce9
Fix (harmless) use of uninitialized variables in Cycles
===================================================================
M intern/cycles/render/background.cpp
M intern/cycles/render/scene.cpp
===================================================================
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 ¶ms_, 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));
More information about the Bf-blender-cvs
mailing list