diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-01-10 15:59:53 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-01-10 15:59:53 +0300 |
| commit | a6fcfe5174ccba9600afdd4b15f434157072e418 (patch) | |
| tree | bbad5f570038b08dd4227c797b05e86ebaabb581 /source/blender/nodes/shader/CMakeLists.txt | |
| parent | d55eaefa8f065b210ca8ccef56ff4f3f47d9c2aa (diff) | |
| parent | faeab8367c68356c1defa7db78cb841c087faa45 (diff) | |
Merge branch 'master' into tmp-vector-template
# Conflicts:
# source/blender/blenlib/BLI_float2.hh
# source/blender/blenlib/BLI_float3.hh
# source/blender/blenlib/BLI_float4.hh
Diffstat (limited to 'source/blender/nodes/shader/CMakeLists.txt')
0 files changed, 0 insertions, 0 deletions