diff options
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index bb381e0dd1e..a6584966643 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -76,7 +76,7 @@ static int set_pointer_type(ButsContextPath *path, bContextDataResult *result, S ptr = &path->ptr[a]; if (RNA_struct_is_a(ptr->type, type)) { - CTX_data_pointer_set(result, ptr->id.data, ptr->type, ptr->data); + CTX_data_pointer_set(result, ptr->owner_id, ptr->type, ptr->data); return 1; } } @@ -894,7 +894,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r if (ct->user && ct->user->ptr.data) { ButsTextureUser *user = ct->user; - CTX_data_pointer_set(result, user->ptr.id.data, user->ptr.type, user->ptr.data); + CTX_data_pointer_set(result, user->ptr.owner_id, user->ptr.type, user->ptr.data); } return 1; @@ -982,7 +982,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r PointerRNA *ptr = get_pointer_type(path, &RNA_ParticleSettings); if (ptr && ptr->data) { - CTX_data_pointer_set(result, ptr->id.data, &RNA_ParticleSettings, ptr->data); + CTX_data_pointer_set(result, ptr->owner_id, &RNA_ParticleSettings, ptr->data); return 1; } else { @@ -991,7 +991,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r if (ptr && ptr->data) { ParticleSettings *part = ((ParticleSystem *)ptr->data)->part; - CTX_data_pointer_set(result, ptr->id.data, &RNA_ParticleSettings, part); + CTX_data_pointer_set(result, ptr->owner_id, &RNA_ParticleSettings, part); return 1; } } @@ -1249,8 +1249,8 @@ ID *buttons_context_id_path(const bContext *C) } } - if (ptr->id.data) { - return ptr->id.data; + if (ptr->owner_id) { + return ptr->owner_id; } } } |