diff options
Diffstat (limited to 'intern/cycles/render/shader.cpp')
| -rw-r--r-- | intern/cycles/render/shader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index e428e174712..8148757b693 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -579,7 +579,8 @@ void ShaderManager::add_default(Scene *scene) { /* default surface */ { - ShaderGraph *graph = new ShaderGraph(); + Shader *shader = new Shader(); + ShaderGraph *graph = new ShaderGraph(shader); DiffuseBsdfNode *diffuse = new DiffuseBsdfNode(); diffuse->color = make_float3(0.8f, 0.8f, 0.8f); @@ -587,7 +588,6 @@ void ShaderManager::add_default(Scene *scene) graph->connect(diffuse->output("BSDF"), graph->output()->input("Surface")); - Shader *shader = new Shader(); shader->name = "default_surface"; shader->graph = graph; scene->shaders.push_back(shader); @@ -596,7 +596,8 @@ void ShaderManager::add_default(Scene *scene) /* default light */ { - ShaderGraph *graph = new ShaderGraph(); + Shader *shader = new Shader(); + ShaderGraph *graph = new ShaderGraph(shader); EmissionNode *emission = new EmissionNode(); emission->color = make_float3(0.8f, 0.8f, 0.8f); @@ -605,7 +606,6 @@ void ShaderManager::add_default(Scene *scene) graph->connect(emission->output("Emission"), graph->output()->input("Surface")); - Shader *shader = new Shader(); shader->name = "default_light"; shader->graph = graph; scene->shaders.push_back(shader); @@ -614,9 +614,9 @@ void ShaderManager::add_default(Scene *scene) /* default background */ { - ShaderGraph *graph = new ShaderGraph(); - Shader *shader = new Shader(); + ShaderGraph *graph = new ShaderGraph(shader); + shader->name = "default_background"; shader->graph = graph; scene->shaders.push_back(shader); @@ -625,9 +625,9 @@ void ShaderManager::add_default(Scene *scene) /* default empty */ { - ShaderGraph *graph = new ShaderGraph(); - Shader *shader = new Shader(); + ShaderGraph *graph = new ShaderGraph(shader); + shader->name = "default_empty"; shader->graph = graph; scene->shaders.push_back(shader); |