Revert "Cycles API: encapsulate Node socket members"

This reverts commit 527f8b32b32187f754e5b176db6377736f9cb8ff. It is causing
motion blur test failures and crashes in some renders, reverting until this is
fixed.

2 files changed, 9 insertions, 9 deletions

diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp
index 4efdb98aa0f..91c7f4bea05 100644
--- a/intern/cycles/subd/subd_dice.cpp
+++ b/intern/cycles/subd/subd_dice.cpp
@@ -42,11 +42,11 @@ void EdgeDice::reserve(int num_verts, int num_triangles)
 {
   Mesh *mesh = params.mesh;
 
-  vert_offset = mesh->get_verts().size();
+  vert_offset = mesh->verts.size();
   tri_offset = mesh->num_triangles();
 
-  mesh->resize_mesh(mesh->get_verts().size() + num_verts, mesh->num_triangles());
-  mesh->reserve_mesh(mesh->get_verts().size() + num_verts, mesh->num_triangles() + num_triangles);
+  mesh->resize_mesh(mesh->verts.size() + num_verts, mesh->num_triangles());
+  mesh->reserve_mesh(mesh->verts.size() + num_verts, mesh->num_triangles() + num_triangles);
 
   Attribute *attr_vN = mesh->attributes.add(ATTR_STD_VERTEX_NORMAL);
 
diff --git a/intern/cycles/subd/subd_split.cpp b/intern/cycles/subd/subd_split.cpp
index 928f5bf2ed7..1a8c182510c 100644
--- a/intern/cycles/subd/subd_split.cpp
+++ b/intern/cycles/subd/subd_split.cpp
@@ -341,8 +341,8 @@ void DiagSplit::split_patches(Patch *patches, size_t patches_byte_stride)
 {
   int patch_index = 0;
 
-  for (int f = 0; f < params.mesh->get_num_subd_faces(); f++) {
-    Mesh::SubdFace face = params.mesh->get_subd_face(f);
+  for (int f = 0; f < params.mesh->subd_faces.size(); f++) {
+    Mesh::SubdFace &face = params.mesh->subd_faces[f];
 
     Patch *patch = (Patch *)(((char *)patches) + patch_index * patches_byte_stride);
 
@@ -372,8 +372,8 @@ static Edge *create_edge_from_corner(DiagSplit *split,
                                      int v0,
                                      int v1)
 {
-  int a = mesh->get_subd_face_corners()[face.start_corner + mod(corner + 0, face.num_corners)];
-  int b = mesh->get_subd_face_corners()[face.start_corner + mod(corner + 1, face.num_corners)];
+  int a = mesh->subd_face_corners[face.start_corner + mod(corner + 0, face.num_corners)];
+  int b = mesh->subd_face_corners[face.start_corner + mod(corner + 1, face.num_corners)];
 
   reversed = !(b < a);
 
@@ -443,8 +443,8 @@ static Edge *create_split_edge_from_corner(DiagSplit *split,
 {
   Edge *edge = split->alloc_edge();
 
-  int a = mesh->get_subd_face_corners()[face.start_corner + mod(corner + 0, face.num_corners)];
-  int b = mesh->get_subd_face_corners()[face.start_corner + mod(corner + 1, face.num_corners)];
+  int a = mesh->subd_face_corners[face.start_corner + mod(corner + 0, face.num_corners)];
+  int b = mesh->subd_face_corners[face.start_corner + mod(corner + 1, face.num_corners)];
 
   if (b < a) {
     edge->stitch_edge_key = {b, a};