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:
authorPhilipp Oeser <info@graphics-engineer.com>2021-09-08 17:50:21 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-09-09 09:38:34 +0300
commit9bb99532a5fd2bea0d31baeced47b92b36649109 (patch)
tree257ce9b15148ae1e23eea66b9dd8f60ad1d56b71
parentb81364837882d0574fbc97e6399300d669e9015e (diff)
Fix typo in BKE_object_as_kdtree
Seems like an oversight in {rB86635402d516}? Stumbled over this while investigating another report, but this line in its current form does not make sense (was taking derivedFinal - not derivedDeform - prior so I assume this has to be BKE_object_get_evaluated_mesh now). (it is now only used for vertex parenting where this should not be an issue, but best keep this generic). Differential Revision: https://developer.blender.org/D12425
-rw-r--r--source/blender/blenkernel/intern/object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index d0d1db9b4f8..aea8d84047d 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -5312,7 +5312,7 @@ KDTree_3d *BKE_object_as_kdtree(Object *ob, int *r_tot)
unsigned int i;
Mesh *me_eval = ob->runtime.mesh_deform_eval ? ob->runtime.mesh_deform_eval :
- ob->runtime.mesh_deform_eval;
+ BKE_object_get_evaluated_mesh(ob);
const int *index;
if (me_eval && (index = CustomData_get_layer(&me_eval->vdata, CD_ORIGINDEX))) {