diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 11:52:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-13 11:52:40 +0300 |
| commit | ef423d9876378bf7568da69b70594f1d5d18f376 (patch) | |
| tree | 0dd3ed747ce017e6294e22c3516afa509fb12b62 /source/blender/blenkernel/intern/idprop.c | |
| parent | 80a983ae5e506850e94f8a9bd410d2b1eca5691f (diff) | |
| parent | f4213c1408619d1071004247ed099e2ba98a3e9a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index e164e1862d5..8cc40d4e74c 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -913,7 +913,6 @@ bool IDP_EqualsProperties_ex(IDProperty *prop1, IDProperty *prop2, const bool is case IDP_ID: return (IDP_Id(prop1) == IDP_Id(prop2)); default: - /* should never get here */ BLI_assert(0); break; } @@ -1015,7 +1014,8 @@ IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char * prop->data.pointer = MEM_mallocN(DEFAULT_ALLOC_FOR_NULL_STRINGS, "id property string 1"); *IDP_String(prop) = '\0'; prop->totallen = DEFAULT_ALLOC_FOR_NULL_STRINGS; - prop->len = 1; /*NULL string, has len of 1 to account for null byte.*/ + /* NULL string, has len of 1 to account for null byte. */ + prop->len = 1; } else { BLI_assert((int)val->string.len <= (int)strlen(st) + 1); @@ -1030,8 +1030,8 @@ IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char * } case IDP_GROUP: { + /* Values are set properly by calloc. */ prop = MEM_callocN(sizeof(IDProperty), "IDProperty group"); - /* heh I think all needed values are set properly by calloc anyway :) */ break; } case IDP_ID: |