diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 17:53:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 17:53:12 +0300 |
| commit | 346964eb3f3c3074d30676f27ed477ce542299ea (patch) | |
| tree | 24112aba81885de0ccb4e21030df67635bae819c /source/blender/blenkernel/intern/idprop.c | |
| parent | 39451ac7128ef753da24ae74486c51a8a40e2719 (diff) | |
| parent | fd203a09330ce88725e8c5c8d9b1f9ce7b2f3c10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/gpencil/drawgpencil.c
Diffstat (limited to 'source/blender/blenkernel/intern/idprop.c')
| -rw-r--r-- | source/blender/blenkernel/intern/idprop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index e51c47d7b19..7c79e13cb01 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -891,7 +891,7 @@ IDProperty *IDP_New(const char type, const IDPropertyTemplate *val, const char * *(float *)&prop->data.val = val->f; break; case IDP_DOUBLE: - prop = MEM_callocN(sizeof(IDProperty), "IDProperty float"); + prop = MEM_callocN(sizeof(IDProperty), "IDProperty double"); *(double *)&prop->data.val = val->d; break; case IDP_ARRAY: |