Fix #102885: IDproperty subtype can cause Blender UI to throw exception #112582

Closed

Jorijn de Graaf wants to merge 2 commits from bonj/blender:fix/custom-property-subtype into main

pull from: bonj/blender:fix/custom-property-subtype

merge into: blender:main

blender:main

blender:universal-scene-description

blender:brush-assets-project

blender:blender-v3.3-release

blender:blender-v3.6-release

blender:partial-write-refactor

blender:blender-v4.1-release

blender:blender-v3.6-temp_wmoss_animrig_public

blender:temp-sculpt-dyntopo

blender:gpencil-next

blender:anim/animation-id-113594

blender:blender-v4.0-release

blender:blender-projects-basics

blender:bridge-curves

blender:sculpt-blender

blender:asset-browser-frontend-split

blender:asset-shelf

blender:tmp-usd-python-mtl

blender:tmp-usd-3.6

blender:blender-v3.5-release

blender:blender-v2.93-release

blender:realtime-clock

blender:sculpt-dev

blender:bevelv2

blender:xr-dev

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.

Conversation 6 Commits 2 Files Changed 1 +2 -1

2 Commits

Author	SHA1	Message	Date
Jorijn de Graaf	21336ae243	Merge branch 'main' into fix/custom-property-subtype	2023-10-19 23:07:01 +02:00
Jorijn de Graaf	a9c04195c1	Check whether custom property subtype is valid ... When the subtype of a custom property is set programmatically to something that isn't in the subtype enum of this operator, attempting to edit it will throw an error. This check should avoid that, by simply not setting the subtype if it's not in the enum, resulting in a default subtype of NONE.	2023-09-18 23:42:46 +02:00