diff options
| author | Jacques Lucke <mail@jlucke.com> | 2019-01-09 12:39:31 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2019-01-09 12:40:05 +0300 |
| commit | 22ddd573638582ad5213bb4a7ff23ccae50dd285 (patch) | |
| tree | 45f521fa73ae8a4062113c297e3e0703a549c2ca /source/blender/blenkernel/intern/unit.c | |
| parent | 06d1c2f7373d3b506675dd671661be26bc50704f (diff) | |
Fix T60338: Allow user to input units of another system
Diffstat (limited to 'source/blender/blenkernel/intern/unit.c')
| -rw-r--r-- | source/blender/blenkernel/intern/unit.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 7cac4c148ff..3fd47b515f6 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -721,14 +721,16 @@ static const bUnitDef *unit_detect_from_str(const bUnitCollection *usys, const c return unit; } -bool bUnit_ContainsUnit(const char *str, int system, int type) +bool bUnit_ContainsUnit(const char *str, int type) { - const bUnitCollection *usys = unit_get_system(system, type); - if (!is_valid_unit_collection(usys)) return false; + for (int system = 0; system < UNIT_SYSTEM_TOT; system++) { + const bUnitCollection *usys = unit_get_system(system, type); + if (!is_valid_unit_collection(usys)) continue; - for (int i = 0; i < usys->length; i++) { - if (unit_find(str, usys->units + i)) { - return true; + for (int i = 0; i < usys->length; i++) { + if (unit_find(str, usys->units + i)) { + return true; + } } } return false; |