diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-02-10 18:59:57 +0300 |
| commit | a7ae33202fa94a52235fbe595873d81e482d5f58 (patch) | |
| tree | c075afc26803edd25de9021d3190d2d9613f741d /intern/cycles/scene/light.cpp | |
| parent | a5cddaefd344a4ab8c1d5d1be39edf6e6dc456e0 (diff) | |
| parent | ad77b52abcbd0daf0d1a3ad395983cb90beeb72a (diff) | |
Merge branch 'master' into greasepencil-objectgreasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_gpencil_update_cache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_update_cache.c
source/blender/blenlib/BLI_listbase.h
source/blender/blenlib/intern/DLRB_tree.c
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesrna/intern/rna_gpencil.c
Diffstat (limited to 'intern/cycles/scene/light.cpp')
| -rw-r--r-- | intern/cycles/scene/light.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/scene/light.cpp b/intern/cycles/scene/light.cpp index 83e531f42ef..415c4044aee 100644 --- a/intern/cycles/scene/light.cpp +++ b/intern/cycles/scene/light.cpp @@ -606,8 +606,8 @@ void LightManager::device_update_background(Device *device, ImageMetaData metadata; if (!env->handle.empty()) { ImageMetaData metadata = env->handle.metadata(); - environment_res.x = max(environment_res.x, metadata.width); - environment_res.y = max(environment_res.y, metadata.height); + environment_res.x = max(environment_res.x, (int)metadata.width); + environment_res.y = max(environment_res.y, (int)metadata.height); } } if (node->type == SkyTextureNode::get_node_type()) { |