diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-02 13:46:14 +0300 |
| commit | d09920687c4474f5f6ccf0f089d359f69932afac (patch) | |
| tree | 3fa95c573d162f2b228d1165b66f9bb6d41cf538 /intern/cycles/render | |
| parent | adc17317c5af23c0986a449da6d0aef130d1f503 (diff) | |
| parent | 128506eeb1a2d87393061b4c9783289a5e4b3275 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index d732189af66..01399c85bc0 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -4601,7 +4601,7 @@ void AttributeNode::compile(SVMCompiler& compiler) ShaderOutput *vector_out = output("Vector"); ShaderOutput *fac_out = output("Fac"); ShaderNodeType attr_node = NODE_ATTR; - int attr = compiler.attribute_standard(attribute);; + int attr = compiler.attribute_standard(attribute); if(bump == SHADER_BUMP_DX) attr_node = NODE_ATTR_BUMP_DX; diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 138de250c5f..4d64d841206 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -480,7 +480,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s kobject.dupli_uv[1] = ob->dupli_uv[1]; int totalsteps = mesh->motion_steps; kobject.numsteps = (totalsteps - 1)/2; - kobject.numverts = mesh->verts.size();; + kobject.numverts = mesh->verts.size(); kobject.patch_map_offset = 0; kobject.attribute_map_offset = 0; |