Commit graph

6 commits

Author SHA1 Message Date
Lubos Lenco 98eeccd71d
Merge pull request #2082 from armory3d/blender2.9
Blender 2.9 LTS support
2021-05-10 11:14:39 +02:00
N8n5h 766e26a7df Expose collision filter mask as integer to the UI 2021-04-03 20:49:33 -03:00
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
N8n5h ca2c3e151a Modified UI for collision filter props_collision_filter_mask
* Moved to collision filter mask panel under armory props to keep UI
more tidy.
* Moved the `arm_rb_collision_filter_mask` property out of the
props_collision_filter_mask to be with the rest of the properties.
* Changed name and description of collision filter mask to be more
consistent with the existing rigid body UI.
2021-03-17 20:28:26 -03:00
Moritz Brückner ba62ba0285 Blender 2.9: Fix/Improve collision filter mask UI 2021-01-25 14:01:53 +01:00
marketgarden c9911ad25f add collision-filter-mask feature 2019-09-10 23:09:44 +02:00