Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-12-05 01:47:13 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-12-05 12:58:58 +0300
commit80ffd7b4597cdb01b3595a22c4e0cc0d8f019471 (patch)
treef154a991900e4f2672fde797b4069d67d7d760e1 /source/blender/blenkernel/intern/DerivedMesh.c
parent8e31e67bf5c0a33d6e1aba0c41e6af8d199aebcc (diff)
Implement bvhtree.fromObject
Passing depsgraph instead of scene, since a scene does not fully define the state of object you want to use for the BVH. Also, mesh_create_eval_final_view and mesh_create_eval_final_render are pretty much the same, so mesh_create_eval_no_deform and mesh_create_eval_no_deform_render are as well. Issue reported on: T58734 Reviewers: sergey https://developer.blender.org/D4032
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index abad99a4909..aa1966b0053 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2348,13 +2348,26 @@ Mesh *mesh_create_eval_final_view(
return final;
}
-DerivedMesh *mesh_create_derived_no_deform(
+Mesh *mesh_create_eval_no_deform(
struct Depsgraph *depsgraph, Scene *scene, Object *ob,
float (*vertCos)[3], CustomDataMask dataMask)
{
- DerivedMesh *final;
+ Mesh *final;
- mesh_calc_modifiers_dm(
+ mesh_calc_modifiers(
+ depsgraph, scene, ob, vertCos, 0, false, dataMask, -1, false, false,
+ NULL, &final);
+
+ return final;
+}
+
+Mesh *mesh_create_eval_no_deform_render(
+ struct Depsgraph *depsgraph, Scene *scene, Object *ob,
+ float (*vertCos)[3], CustomDataMask dataMask)
+{
+ Mesh *final;
+
+ mesh_calc_modifiers(
depsgraph, scene, ob, vertCos, 0, false, dataMask, -1, false, false,
NULL, &final);