diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /source/blender/blenkernel/BKE_cdderivedmesh.h | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'source/blender/blenkernel/BKE_cdderivedmesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_cdderivedmesh.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h index b0ade7bacdf..9948f21ba90 100644 --- a/source/blender/blenkernel/BKE_cdderivedmesh.h +++ b/source/blender/blenkernel/BKE_cdderivedmesh.h @@ -40,6 +40,7 @@ struct DerivedMesh; struct BMEditMesh; struct Mesh; +struct MLoopNorSpaceArray; struct Object; /* creates a new CDDerivedMesh */ @@ -83,9 +84,15 @@ struct DerivedMesh *CDDM_copy_from_tessface(struct DerivedMesh *dm); * given DerivedMesh and containing the requested numbers of elements. * elements are initialized to all zeros */ -struct DerivedMesh *CDDM_from_template(struct DerivedMesh *source, - int numVerts, int numEdges, int numFaces, - int numLoops, int numPolys); +struct DerivedMesh *CDDM_from_template_ex( + struct DerivedMesh *source, + int numVerts, int numEdges, int numFaces, + int numLoops, int numPolys, + CustomDataMask mask); +struct DerivedMesh *CDDM_from_template( + struct DerivedMesh *source, + int numVerts, int numEdges, int numFaces, + int numLoops, int numPolys); /* converts mfaces to mpolys. note things may break if there are not valid * medges surrounding each mface. @@ -106,7 +113,9 @@ void CDDM_calc_normals_mapping(struct DerivedMesh *dm); void CDDM_calc_normals(struct DerivedMesh *dm); void CDDM_calc_normals_tessface(struct DerivedMesh *dm); -void CDDM_calc_loop_normals(struct DerivedMesh *dm, const float split_angle); +void CDDM_calc_loop_normals(struct DerivedMesh *dm, const bool use_split_normals, const float split_angle); +void CDDM_calc_loop_normals_spacearr(struct DerivedMesh *dm, const bool use_split_normals, const float split_angle, + struct MLoopNorSpaceArray *r_lnors_spacearr); /* calculates edges for a CDDerivedMesh (from face data) * this completely replaces the current edge data in the DerivedMesh @@ -122,6 +131,8 @@ void CDDM_calc_edges(struct DerivedMesh *dm); void CDDM_recalc_tessellation(struct DerivedMesh *dm); void CDDM_recalc_tessellation_ex(struct DerivedMesh *dm, const bool do_face_nor_cpy); +void CDDM_recalc_looptri(struct DerivedMesh *dm); + /* lowers the number of vertices/edges/faces in a CDDerivedMesh * the layer data stays the same size */ |