diff options
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph/FrsMaterial.h')
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/FrsMaterial.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index 4176a558009..c5a87c3baaf 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -445,22 +445,29 @@ FrsMaterial &FrsMaterial::operator=(const FrsMaterial &m) bool FrsMaterial::operator!=(const FrsMaterial &m) const { - if (Shininess != m.shininess()) + if (Shininess != m.shininess()) { return true; - if (Priority != m.priority()) + } + if (Priority != m.priority()) { return true; + } for (int i = 0; i < 4; i++) { - if (Line[i] != m.line()[i]) + if (Line[i] != m.line()[i]) { return true; - if (Diffuse[i] != m.diffuse()[i]) + } + if (Diffuse[i] != m.diffuse()[i]) { return true; - if (Specular[i] != m.specular()[i]) + } + if (Specular[i] != m.specular()[i]) { return true; - if (Ambient[i] != m.ambient()[i]) + } + if (Ambient[i] != m.ambient()[i]) { return true; - if (Emission[i] != m.emission()[i]) + } + if (Emission[i] != m.emission()[i]) { return true; + } } return false; |