diff options
| author | Dalai Felinto <dalai@blender.org> | 2021-11-25 20:00:33 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2021-11-25 20:00:33 +0300 |
| commit | e3d3296327e9b4d97141e46707b5565246b22982 (patch) | |
| tree | 55e27fc6c184f4f50c7de9f8176abda093033a4f /intern/cycles/blender/addon/properties.py | |
| parent | 4a3f99ad5a2e6e87156baa5c6f2184df8ea09683 (diff) | |
| parent | e6a41e1c806b318eaa866fdc2a100c4e7fedfb15 (diff) | |
Merge remote-tracking branch 'origin/blender-v3.0-release'
Merge conflict: Makes sure master is still alpha, while 3.0 is rc.
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
0 files changed, 0 insertions, 0 deletions