diff options
author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-18 01:49:18 +0300 |
---|---|---|
committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-08-18 01:49:18 +0300 |
commit | 7baf93c711ad1af621b41314f59c1597fbd41ca5 (patch) | |
tree | 977e1cff2409d565e35575793eadd1e88a558a60 /intern/cycles/subd | |
parent | 40b367479c6fe23d6f2b6d822f2d5266485619f3 (diff) |
Revert "Code cleanup to use array.data() rather than &array[0]."
This reverts commit 40b367479c6fe23d6f2b6d822f2d5266485619f3.
Didn't build or solve any known issue. Please don't push changes without
testing them first.
Diffstat (limited to 'intern/cycles/subd')
-rw-r--r-- | intern/cycles/subd/subd_dice.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/subd/subd_patch_table.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/subd/subd_patch_table.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/subd/subd_dice.cpp b/intern/cycles/subd/subd_dice.cpp index a1bd349b167..36981a20f3c 100644 --- a/intern/cycles/subd/subd_dice.cpp +++ b/intern/cycles/subd/subd_dice.cpp @@ -57,7 +57,7 @@ void EdgeDice::reserve(int num_verts) Attribute *attr_vN = mesh->attributes.add(ATTR_STD_VERTEX_NORMAL); - mesh_P = mesh->verts.data(); + mesh_P = &mesh->verts[0]; mesh_N = attr_vN->data_float3(); } diff --git a/intern/cycles/subd/subd_patch_table.cpp b/intern/cycles/subd/subd_patch_table.cpp index 62572efa88a..68ec1b2c6a6 100644 --- a/intern/cycles/subd/subd_patch_table.cpp +++ b/intern/cycles/subd/subd_patch_table.cpp @@ -214,7 +214,7 @@ void PackedPatchTable::pack(Far::PatchTable* patch_table, int offset) } table.resize(total_size()); - uint* data = table.data(); + uint* data = &table[0]; uint* array = data; uint* index = array + num_arrays * PATCH_ARRAY_SIZE; @@ -259,7 +259,7 @@ void PackedPatchTable::pack(Far::PatchTable* patch_table, int offset) void PackedPatchTable::copy_adjusting_offsets(uint* dest, int doffset) { - uint* src = table.data(); + uint* src = &table[0]; /* arrays */ for(int i = 0; i < num_arrays; i++) { diff --git a/intern/cycles/subd/subd_patch_table.h b/intern/cycles/subd/subd_patch_table.h index 3166a1691d8..c8c7ecf9e47 100644 --- a/intern/cycles/subd/subd_patch_table.h +++ b/intern/cycles/subd/subd_patch_table.h @@ -43,7 +43,7 @@ namespace Far { struct PatchTable; } #define PATCH_NODE_SIZE 1 struct PackedPatchTable { - array<uint> table; + vector<uint> table; size_t num_arrays; size_t num_indices; |