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

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c
index abbbd04143c..adc041174aa 100644
--- a/source/blender/makesrna/intern/rna_mask.c
+++ b/source/blender/makesrna/intern/rna_mask.c
@@ -58,7 +58,7 @@
 
 static void rna_Mask_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
-  Mask *mask = ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
 
   WM_main_add_notifier(NC_MASK | ND_DATA, mask);
   DEG_id_tag_update(&mask->id, 0);
@@ -147,21 +147,21 @@ static void rna_MaskParent_id_type_set(PointerRNA *ptr, int value)
 
 static void rna_Mask_layers_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
 
   rna_iterator_listbase_begin(iter, &mask->masklayers, NULL);
 }
 
 static int rna_Mask_layer_active_index_get(PointerRNA *ptr)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
 
   return mask->masklay_act;
 }
 
 static void rna_Mask_layer_active_index_set(PointerRNA *ptr, int value)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
 
   mask->masklay_act = value;
 }
@@ -169,7 +169,7 @@ static void rna_Mask_layer_active_index_set(PointerRNA *ptr, int value)
 static void rna_Mask_layer_active_index_range(
     PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
 
   *min = 0;
   *max = max_ii(0, mask->masklay_tot - 1);
@@ -188,7 +188,7 @@ static char *rna_MaskLayer_path(PointerRNA *ptr)
 
 static PointerRNA rna_Mask_layer_active_get(PointerRNA *ptr)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
   MaskLayer *masklay = BKE_mask_layer_active(mask);
 
   return rna_pointer_inherit_refine(ptr, &RNA_MaskLayer, masklay);
@@ -198,7 +198,7 @@ static void rna_Mask_layer_active_set(PointerRNA *ptr,
                                       PointerRNA value,
                                       struct ReportList *UNUSED(reports))
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
   MaskLayer *masklay = (MaskLayer *)value.data;
 
   BKE_mask_layer_active_set(mask, masklay);
@@ -213,7 +213,7 @@ static void rna_MaskLayer_splines_begin(CollectionPropertyIterator *iter, Pointe
 
 static void rna_MaskLayer_name_set(PointerRNA *ptr, const char *value)
 {
-  Mask *mask = (Mask *)ptr->id.data;
+  Mask *mask = (Mask *)ptr->owner_id;
   MaskLayer *masklay = (MaskLayer *)ptr->data;
   char oldname[sizeof(masklay->name)], newname[sizeof(masklay->name)];
 
@@ -351,7 +351,7 @@ static void rna_MaskSplinePoint_handle_type_set(PointerRNA *ptr, int value)
 {
   MaskSplinePoint *point = (MaskSplinePoint *)ptr->data;
   BezTriple *bezt = &point->bezt;
-  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->id.data, point);
+  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->owner_id, point);
 
   bezt->h1 = bezt->h2 = value;
   mask_point_check_stick(point);
@@ -370,7 +370,7 @@ static void rna_MaskSplinePoint_handle_left_type_set(PointerRNA *ptr, int value)
 {
   MaskSplinePoint *point = (MaskSplinePoint *)ptr->data;
   BezTriple *bezt = &point->bezt;
-  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->id.data, point);
+  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->owner_id, point);
 
   bezt->h1 = value;
   mask_point_check_stick(point);
@@ -389,7 +389,7 @@ static void rna_MaskSplinePoint_handle_right_type_set(PointerRNA *ptr, int value
 {
   MaskSplinePoint *point = (MaskSplinePoint *)ptr->data;
   BezTriple *bezt = &point->bezt;
-  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->id.data, point);
+  MaskSpline *spline = mask_spline_from_point((Mask *)ptr->owner_id, point);
 
   bezt->h2 = value;
   mask_point_check_stick(point);