diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 11:45:39 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 11:45:39 +0300 |
commit | 528f0b95c4462b2e429600a566ca0434c90310f6 (patch) | |
tree | 1185ea1afe8107fc48a794e1fb97e08d004e5711 /source/blender/editors/object/object_shader_fx.c | |
parent | 5a842b3412c100588bc1f7a9d4532e810e8e1792 (diff) | |
parent | 41bb0548b0c1ac62d30cf14fca371b220e40f72e (diff) |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/object/object_shader_fx.c')
0 files changed, 0 insertions, 0 deletions