Moritz Brückner f64419dd06 Merge branch 'master' into blender2.9 ... # Conflicts: # blender/arm/material/shader.py # blender/arm/props_collision_filter_mask.py # blender/arm/props_ui.py		2021-04-03 14:12:54 +02:00
..
arm	Merge branch 'master' into blender2.9	2021-04-03 14:12:54 +02:00
data	Cleanup	2018-11-19 14:28:04 +01:00
__init__.py	Begin refactoring	2015-10-30 13:23:09 +01:00
start.py	Add ShaderData node	2020-08-19 17:20:41 +02:00