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

4 files changed, 28 insertions, 28 deletions

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 832bf1e9b6d..51191b45439 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2259,7 +2259,7 @@ static int wm_handler_operator_call(bContext *C,
 
     if (ot && wm_operator_check_locked_interface(C, ot)) {
       bool use_last_properties = true;
-      PointerRNA tool_properties = {{0}};
+      PointerRNA tool_properties = {0};
 
       bToolRef *keymap_tool = ((handler_base->type == WM_HANDLER_TYPE_KEYMAP) ?
                                    ((wmEventHandler_Keymap *)handler_base)->keymap_tool :
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 75d262f48a0..c79bae5b717 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -368,7 +368,7 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
       continue;
     }
 
-    if (ptr->id.data == ctx_item_ptr.id.data) {
+    if (ptr->owner_id == ctx_item_ptr.owner_id) {
       if ((ptr->data == ctx_item_ptr.data) && (ptr->type == ctx_item_ptr.type)) {
         /* found! */
         member_found = identifier;
@@ -402,13 +402,13 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
 {
   const char *member_id = NULL;
 
-  if (ptr->id.data) {
+  if (ptr->owner_id) {
 
 #  define CTX_TEST_PTR_ID(C, member, idptr) \
     { \
       const char *ctx_member = member; \
       PointerRNA ctx_item_ptr = CTX_data_pointer_get(C, ctx_member); \
-      if (ctx_item_ptr.id.data == idptr) { \
+      if (ctx_item_ptr.owner_id == idptr) { \
         member_id = ctx_member; \
         break; \
       } \
@@ -420,7 +420,7 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
       const char *ctx_member = member; \
       const char *ctx_member_full = member_full; \
       PointerRNA ctx_item_ptr = CTX_data_pointer_get(C, ctx_member); \
-      if (ctx_item_ptr.id.data && cast(ctx_item_ptr.id.data) == idptr) { \
+      if (ctx_item_ptr.owner_id && (ID *)cast(ctx_item_ptr.owner_id) == idptr) { \
         member_id = ctx_member_full; \
         break; \
       } \
@@ -447,19 +447,19 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
     } \
     (void)0
 
-    switch (GS(((ID *)ptr->id.data)->name)) {
+    switch (GS(ptr->owner_id->name)) {
       case ID_SCE: {
-        CTX_TEST_PTR_ID(C, "scene", ptr->id.data);
+        CTX_TEST_PTR_ID(C, "scene", ptr->owner_id);
         break;
       }
       case ID_OB: {
-        CTX_TEST_PTR_ID(C, "object", ptr->id.data);
+        CTX_TEST_PTR_ID(C, "object", ptr->owner_id);
         break;
       }
       /* from rna_Main_objects_new */
       case OB_DATA_SUPPORT_ID_CASE: {
 #  define ID_CAST_OBDATA(id_pt) (((Object *)(id_pt))->data)
-        CTX_TEST_PTR_ID_CAST(C, "object", "object.data", ID_CAST_OBDATA, ptr->id.data);
+        CTX_TEST_PTR_ID_CAST(C, "object", "object.data", ID_CAST_OBDATA, ptr->owner_id);
         break;
 #  undef ID_CAST_OBDATA
       }
@@ -467,18 +467,18 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
 #  define ID_CAST_OBMATACT(id_pt) \
     (give_current_material(((Object *)id_pt), ((Object *)id_pt)->actcol))
         CTX_TEST_PTR_ID_CAST(
-            C, "object", "object.active_material", ID_CAST_OBMATACT, ptr->id.data);
+            C, "object", "object.active_material", ID_CAST_OBMATACT, ptr->owner_id);
         break;
 #  undef ID_CAST_OBMATACT
       }
       case ID_WO: {
 #  define ID_CAST_SCENEWORLD(id_pt) (((Scene *)(id_pt))->world)
-        CTX_TEST_PTR_ID_CAST(C, "scene", "scene.world", ID_CAST_SCENEWORLD, ptr->id.data);
+        CTX_TEST_PTR_ID_CAST(C, "scene", "scene.world", ID_CAST_SCENEWORLD, ptr->owner_id);
         break;
 #  undef ID_CAST_SCENEWORLD
       }
       case ID_SCR: {
-        CTX_TEST_PTR_ID(C, "screen", ptr->id.data);
+        CTX_TEST_PTR_ID(C, "screen", ptr->owner_id);
 
         SpaceLink *space_data = CTX_wm_space_data(C);
 
diff --git a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
index 73758e2d98f..0c2ce9783ec 100644
--- a/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
+++ b/source/blender/windowmanager/message_bus/intern/wm_message_bus_rna.c
@@ -50,7 +50,7 @@ static uint wm_msg_rna_gset_hash(const void *key_p)
   //  printf("%s\n", RNA_struct_identifier(params->ptr.type));
   uint k = void_hash_uint(params->ptr.type);
   k ^= void_hash_uint(params->ptr.data);
-  k ^= void_hash_uint(params->ptr.id.data);
+  k ^= void_hash_uint(params->ptr.owner_id);
   k ^= void_hash_uint(params->prop);
   return k;
 }
@@ -59,7 +59,7 @@ static bool wm_msg_rna_gset_cmp(const void *key_a_p, const void *key_b_p)
   const wmMsgParams_RNA *params_a = &((const wmMsgSubscribeKey_RNA *)key_a_p)->msg.params;
   const wmMsgParams_RNA *params_b = &((const wmMsgSubscribeKey_RNA *)key_b_p)->msg.params;
   return !((params_a->ptr.type == params_b->ptr.type) &&
-           (params_a->ptr.id.data == params_b->ptr.id.data) &&
+           (params_a->ptr.owner_id == params_b->ptr.owner_id) &&
            (params_a->ptr.data == params_b->ptr.data) && (params_a->prop == params_b->prop));
 }
 static void wm_msg_rna_gset_key_free(void *key_p)
@@ -100,7 +100,7 @@ static void wm_msg_rna_update_by_id(struct wmMsgBus *mbus, ID *id_src, ID *id_ds
   while (BLI_gsetIterator_done(&gs_iter) == false) {
     wmMsgSubscribeKey_RNA *key = BLI_gsetIterator_getKey(&gs_iter);
     BLI_gsetIterator_step(&gs_iter);
-    if (key->msg.params.ptr.id.data == id_src) {
+    if (key->msg.params.ptr.owner_id == id_src) {
 
       /* GSet always needs updating since the key changes. */
       BLI_gset_remove(gs, key, NULL);
@@ -123,10 +123,10 @@ static void wm_msg_rna_update_by_id(struct wmMsgBus *mbus, ID *id_src, ID *id_ds
       if (BLI_listbase_is_empty(&key->head.values)) {
         /* Remove, no reason to keep. */
       }
-      else if (key->msg.params.ptr.data == key->msg.params.ptr.id.data) {
+      else if (key->msg.params.ptr.data == key->msg.params.ptr.owner_id) {
         /* Simple, just update the ID. */
         key->msg.params.ptr.data = id_dst;
-        key->msg.params.ptr.id.data = id_dst;
+        key->msg.params.ptr.owner_id = id_dst;
         remove = false;
       }
       else {
@@ -177,7 +177,7 @@ static void wm_msg_rna_remove_by_id(struct wmMsgBus *mbus, const ID *id)
   while (BLI_gsetIterator_done(&gs_iter) == false) {
     wmMsgSubscribeKey_RNA *key = BLI_gsetIterator_getKey(&gs_iter);
     BLI_gsetIterator_step(&gs_iter);
-    if (key->msg.params.ptr.id.data == id) {
+    if (key->msg.params.ptr.owner_id == id) {
       /* Clear here so we can decrement 'messages_tag_count'. */
       for (wmMsgSubscribeValueLink *msg_lnk = key->head.values.first, *msg_lnk_next; msg_lnk;
            msg_lnk = msg_lnk_next) {
@@ -226,7 +226,7 @@ void WM_msg_publish_rna_params(struct wmMsgBus *mbus, const wmMsgParams_RNA *msg
   CLOG_INFO(WM_LOG_MSGBUS_PUB,
             2,
             "rna(id='%s', %s.%s)",
-            msg_key_params->ptr.id.data ? ((ID *)msg_key_params->ptr.id.data)->name : none,
+            msg_key_params->ptr.owner_id ? ((ID *)msg_key_params->ptr.owner_id)->name : none,
             msg_key_params->ptr.type ? RNA_struct_identifier(msg_key_params->ptr.type) : none,
             msg_key_params->prop ? RNA_property_identifier((PropertyRNA *)msg_key_params->prop) :
                                    none);
@@ -237,7 +237,7 @@ void WM_msg_publish_rna_params(struct wmMsgBus *mbus, const wmMsgParams_RNA *msg
 
   /* Support anonymous subscribers, this may be some extra overhead
    * but we want to be able to be more ambiguous. */
-  if (msg_key_params->ptr.id.data || msg_key_params->ptr.data) {
+  if (msg_key_params->ptr.owner_id || msg_key_params->ptr.data) {
     wmMsgParams_RNA msg_key_params_anon = *msg_key_params;
 
     /* We might want to enable this later? */
@@ -250,7 +250,7 @@ void WM_msg_publish_rna_params(struct wmMsgBus *mbus, const wmMsgParams_RNA *msg
       msg_key_params_anon.prop = msg_key_params->prop;
     }
 
-    msg_key_params_anon.ptr.id.data = NULL;
+    msg_key_params_anon.ptr.owner_id = NULL;
     msg_key_params_anon.ptr.data = NULL;
     if ((key = WM_msg_lookup_rna(mbus, &msg_key_params_anon))) {
       WM_msg_publish_with_key(mbus, &key->head);
@@ -292,7 +292,7 @@ void WM_msg_subscribe_rna_params(struct wmMsgBus *mbus,
   CLOG_INFO(WM_LOG_MSGBUS_SUB,
             3,
             "rna(id='%s', %s.%s, info='%s')",
-            msg_key_params->ptr.id.data ? ((ID *)msg_key_params->ptr.id.data)->name : none,
+            msg_key_params->ptr.owner_id ? ((ID *)msg_key_params->ptr.owner_id)->name : none,
             msg_key_params->ptr.type ? RNA_struct_identifier(msg_key_params->ptr.type) : none,
             msg_key_params->prop ? RNA_property_identifier((PropertyRNA *)msg_key_params->prop) :
                                    none,
@@ -303,7 +303,7 @@ void WM_msg_subscribe_rna_params(struct wmMsgBus *mbus,
 
   if (msg_val_params->is_persistent) {
     if (msg_key->msg.params.data_path == NULL) {
-      if (msg_key->msg.params.ptr.data != msg_key->msg.params.ptr.id.data) {
+      if (msg_key->msg.params.ptr.data != msg_key->msg.params.ptr.owner_id) {
         /* We assume prop type can't change. */
         msg_key->msg.params.data_path = RNA_path_from_ID_to_struct(&msg_key->msg.params.ptr);
       }
@@ -339,14 +339,14 @@ void WM_msg_subscribe_ID(struct wmMsgBus *mbus,
                          const wmMsgSubscribeValue *msg_val_params,
                          const char *id_repr)
 {
-  wmMsgParams_RNA msg_key_params = {{{NULL}}};
+  wmMsgParams_RNA msg_key_params = {NULL};
   RNA_id_pointer_create(id, &msg_key_params.ptr);
   WM_msg_subscribe_rna_params(mbus, &msg_key_params, msg_val_params, id_repr);
 }
 
 void WM_msg_publish_ID(struct wmMsgBus *mbus, ID *id)
 {
-  wmMsgParams_RNA msg_key_params = {{{NULL}}};
+  wmMsgParams_RNA msg_key_params = {NULL};
   RNA_id_pointer_create(id, &msg_key_params.ptr);
   WM_msg_publish_rna_params(mbus, &msg_key_params);
 }
diff --git a/source/blender/windowmanager/message_bus/wm_message_bus.h b/source/blender/windowmanager/message_bus/wm_message_bus.h
index 4a8bce52992..b25f8eeae71 100644
--- a/source/blender/windowmanager/message_bus/wm_message_bus.h
+++ b/source/blender/windowmanager/message_bus/wm_message_bus.h
@@ -173,7 +173,7 @@ void WM_msg_subscribe_static(struct wmMsgBus *mbus,
 /* wm_message_bus_rna.c */
 
 typedef struct wmMsgParams_RNA {
-  /** when #PointerRNA.data & id.data are NULL. match against all. */
+  /** when #PointerRNA.data & owner_id are NULL. match against all. */
   PointerRNA ptr;
   /** when NULL, match against any property. */
   const PropertyRNA *prop;
@@ -233,7 +233,7 @@ void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id);
 
 #define WM_msg_publish_rna_prop(mbus, id_, data_, type_, prop_) \
   { \
-    wmMsgParams_RNA msg_key_params_ = {{{0}}}; \
+    wmMsgParams_RNA msg_key_params_ = {{0}}; \
     _WM_MESSAGE_EXTERN_BEGIN; \
     extern PropertyRNA rna_##type_##_##prop_; \
     _WM_MESSAGE_EXTERN_END; \
@@ -244,7 +244,7 @@ void WM_msg_publish_ID(struct wmMsgBus *mbus, struct ID *id);
   ((void)0)
 #define WM_msg_subscribe_rna_prop(mbus, id_, data_, type_, prop_, value) \
   { \
-    wmMsgParams_RNA msg_key_params_ = {{{0}}}; \
+    wmMsgParams_RNA msg_key_params_ = {{0}}; \
     _WM_MESSAGE_EXTERN_BEGIN; \
     extern PropertyRNA rna_##type_##_##prop_; \
     _WM_MESSAGE_EXTERN_END; \