diff options
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index f919cd36f5c..86c667a38b6 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -664,7 +664,7 @@ public: /*! Returns true if this Stroke has textures assigned, false otherwise. */ inline bool hasTex() const { - return (_mtex && _mtex[0] != NULL) || _nodeTree; + return (_mtex[0] != NULL) || _nodeTree; } /*! Returns true if this Stroke uses a texture with tips, false otherwise. */ diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 91eb2a43132..698e72a6b35 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -2682,6 +2682,9 @@ bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, GSet *bm_faces, f = BLI_gsetIterator_getKey(&gs_iter); GPU_material_diffuse_get(f->mat_nr + 1, diffuse_color); } + else { + return false; + } } else { const DMFlagMat *flags = &buffers->grid_flag_mats[buffers->grid_indices[0]]; @@ -2689,9 +2692,7 @@ bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, GSet *bm_faces, GPU_material_diffuse_get(flags->mat_nr + 1, diffuse_color); } - return diffuse_color[0] != buffers->diffuse_color[0] || - diffuse_color[1] != buffers->diffuse_color[1] || - diffuse_color[2] != buffers->diffuse_color[2]; + return !equals_v3v3(diffuse_color, buffers->diffuse_color); } /* release a GPU_PBVH_Buffers id; |