diff options
author | Jacques Lucke <mail@jlucke.com> | 2019-08-23 10:52:12 +0300 |
---|---|---|
committer | Jacques Lucke <mail@jlucke.com> | 2019-08-23 10:52:12 +0300 |
commit | a1aa4a259713f26c32a5fac4adbe0751e0479f5b (patch) | |
tree | 0737940d32513ad8e2458760c81ad7c1c61e1ce6 /source/blender/makesrna/intern/rna_wm.c | |
parent | 232049dd9408e15d2082181e60ddd775b375ff19 (diff) |
RNA: Cleanup PointerRNA struct
The old layout of `PointerRNA` was confusing for historic reasons:
```
typedef struct PointerRNA {
struct {
void *data;
} id;
struct StructRNA *type;
void *data;
} PointerRNA;
```
This patch updates it to:
```
typedef struct PointerRNA {
struct ID *owner_id;
struct StructRNA *type;
void *data;
} PointerRNA;
```
Throughout the code base `id.data` was replaced with `owner_id`.
Furthermore, many explicit pointer type casts were added which
were implicit before. Some type casts to `ID *` were removed.
Reviewers: brecht, campbellbarton
Differential Revision: https://developer.blender.org/D5558
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 123ec9634c9..c3ffeaf6f6f 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -530,7 +530,7 @@ const EnumPropertyItem rna_enum_wm_report_items[] = { static wmOperator *rna_OperatorProperties_find_operator(PointerRNA *ptr) { - wmWindowManager *wm = ptr->id.data; + wmWindowManager *wm = (wmWindowManager *)ptr->owner_id; if (wm) { IDProperty *properties = (IDProperty *)ptr->data; @@ -668,7 +668,7 @@ static PointerRNA rna_PopupMenu_layout_get(PointerRNA *ptr) uiLayout *layout = UI_popup_menu_layout(pup); PointerRNA rptr; - RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr); + RNA_pointer_create(ptr->owner_id, &RNA_UILayout, layout, &rptr); return rptr; } @@ -679,7 +679,7 @@ static PointerRNA rna_PopoverMenu_layout_get(PointerRNA *ptr) uiLayout *layout = UI_popover_layout(pup); PointerRNA rptr; - RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr); + RNA_pointer_create(ptr->owner_id, &RNA_UILayout, layout, &rptr); return rptr; } @@ -690,7 +690,7 @@ static PointerRNA rna_PieMenu_layout_get(PointerRNA *ptr) uiLayout *layout = UI_pie_menu_layout(pie); PointerRNA rptr; - RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr); + RNA_pointer_create(ptr->owner_id, &RNA_UILayout, layout, &rptr); return rptr; } @@ -804,7 +804,7 @@ static void rna_Window_screen_set(PointerRNA *ptr, static bool rna_Window_screen_assign_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { - bScreen *screen = value.id.data; + bScreen *screen = (bScreen *)value.owner_id; return !screen->temp; } |