Philipp Oeser 3458d09a74 Merge branch 'blender-v2.93-release'

2021-05-15 02:06:02 +02:00

..

addons @ bb16aba5bd

Collada import: connect Emission texture to Emission socket

2021-05-13 23:43:37 +02:00

addons_contrib @ 7d78c8a63f

Collada import: connect Emission texture to Emission socket

2021-05-13 23:43:37 +02:00

freestyle

Pydoc: Fix duplicate totree for freestyle

2020-10-11 15:50:24 -04:00

modules

Python GPU: Replace part of the code that uses 'bgl' with 'gpu'

2021-05-14 12:26:40 -03:00

presets

Merge branch 'blender-v2.93-release'

2021-05-12 22:20:51 +10:00

startup

Merge branch 'blender-v2.93-release'

2021-05-15 02:06:02 +02:00

templates_osl

OSL: add basic OSL shader template

2021-03-26 10:27:31 -06:00

templates_py

Python GPU: Replace a few calls of the bgl module with gpu

2021-05-01 12:12:58 -03:00