diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-03-23 14:11:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-03-23 14:11:29 +0400 |
| commit | 349c5ecc959edbcbb4291b66fd27366a37fa8b8b (patch) | |
| tree | c1a609ebfdd19d3c36053db63e2ef456d5fa6bf6 | |
| parent | 838c263be1e84ee63bf361b48b92f3201a9f05cf (diff) | |
Cycles:
* Avoid an unnecessary condition in light.cpp, (totarea > 0.0f) is always true inside the "if(kintegrator->use_direct_light)" branch.
| -rw-r--r-- | intern/cycles/render/light.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_resources.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 47e9dd8e7f5..4c3c0c7f6a4 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -332,7 +332,7 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen if(kintegrator->use_direct_light) { /* number of emissives */ - kintegrator->num_distribution = (totarea > 0.0f)? num_distribution: 0; + kintegrator->num_distribution = num_distribution; /* precompute pdfs */ kintegrator->pdf_triangles = 0.0f; diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 0cb3b2ce6d1..d84e392ae34 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -307,4 +307,4 @@ const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, i void UI_make_axis_color(const unsigned char *src_col, unsigned char *dst_col, const char axis); -#endif /* UI_ICONS_H */ +#endif /* UI_RESOURCES_H */ |