diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2021-05-26 13:43:03 +0300 |
| commit | 8a6604f253e22bbade3dcf60b9a1c437ace44151 (patch) | |
| tree | fee875d0a0b09fbe0df52aa83094159144048205 /build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake | |
| parent | edf1b833674a6e54df7a16c14f0c6193fbbb482e (diff) | |
| parent | afec66c024dc2b75447537d45406c06342ec201e (diff) | |
Merge branch 'master' into temp-gpencil-maskingtemp-gpencil-masking
Conflicts:
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake')
| -rw-r--r-- | build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake index a0390e3311a..330038f022d 100644 --- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake +++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake @@ -22,7 +22,7 @@ # These are defined by the FindIlmBase module. # OPENEXR_FOUND - True if OpenEXR was found. -# Other standarnd issue macros +# Other standard issue macros include(SelectLibraryConfigurations) include(FindPackageHandleStandardArgs) include(FindPackageMessage) |