diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-12-12 18:17:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-12 18:25:32 +0300 |
| commit | 28a0e1dae5f347edc05b0ac1a5af4de5927e0bbf (patch) | |
| tree | 0899909ca706bade2f3437e9e5584ffb3d93fac0 /source/blender/blenkernel/BKE_idprop.h | |
| parent | fbd25174d1275ddc22a43b4efb437ad23999babe (diff) | |
Fix T42883: ID-Prop arrays longer than 'shot' fail
Diffstat (limited to 'source/blender/blenkernel/BKE_idprop.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_idprop.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h index 6d3d15e3565..f33f3eba590 100644 --- a/source/blender/blenkernel/BKE_idprop.h +++ b/source/blender/blenkernel/BKE_idprop.h @@ -41,13 +41,13 @@ typedef union IDPropertyTemplate { double d; struct { char *str; - short len; + int len; char subtype; } string; struct ID *id; struct { - short type; - short len; + int len; + char type; } array; struct { int matvec_size; @@ -110,7 +110,7 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is bool IDP_EqualsProperties(struct IDProperty *prop1, struct IDProperty *prop2) ATTR_WARN_UNUSED_RESULT; -struct IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); +struct IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); void IDP_FreeProperty(struct IDProperty *prop); |