griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Improve object argument name

Browse Source 
These functions expect an evaluated object which wasn't clear.
This commit is contained in:
Hans Goudey
2024-08-15 13:09:28 -04:00
parent 4333277aa8
commit 220cf67172
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_object.hh
View File

@@ -496,9 +496,9 @@ bool BKE_object_obdata_texspace_get(Object *ob,
float **r_texspace_location,
float **r_texspace_size);
Mesh *BKE_object_get_evaluated_mesh_no_subsurf(const Object *object);
Mesh *BKE_object_get_evaluated_mesh_no_subsurf(const Object *object_eval);
/** Get evaluated mesh for given object. */
Mesh *BKE_object_get_evaluated_mesh(const Object *object);
Mesh *BKE_object_get_evaluated_mesh(const Object *object_eval);
/**
* Same as #BKE_object_get_evaluated_mesh, but does not check
* if the object's geometry is fully evaluated already.

12
source/blender/blenkernel/intern/object.cc
View File

@@ -4156,26 +4156,26 @@ Mesh *BKE_object_get_evaluated_mesh_no_subsurf(const Object *object)
return BKE_object_get_evaluated_mesh_no_subsurf_unchecked(object);
}
Mesh *BKE_object_get_evaluated_mesh_unchecked(const Object *object)
Mesh *BKE_object_get_evaluated_mesh_unchecked(const Object *object_eval)
{
Mesh *mesh = BKE_object_get_evaluated_mesh_no_subsurf_unchecked(object);
Mesh *mesh = BKE_object_get_evaluated_mesh_no_subsurf_unchecked(object_eval);
if (!mesh) {
return nullptr;
}
if (object->data && GS(((const ID *)object->data)->name) == ID_ME) {
if (object_eval->data && GS(((const ID *)object_eval->data)->name) == ID_ME) {
mesh = BKE_mesh_wrapper_ensure_subdivision(mesh);
}
return mesh;
}
Mesh *BKE_object_get_evaluated_mesh(const Object *object)
Mesh *BKE_object_get_evaluated_mesh(const Object *object_eval)
{
if (!DEG_object_geometry_is_evaluated(*object)) {
if (!DEG_object_geometry_is_evaluated(*object_eval)) {
return nullptr;
}
return BKE_object_get_evaluated_mesh_unchecked(object);
return BKE_object_get_evaluated_mesh_unchecked(object_eval);
}
Mesh *BKE_object_get_pre_modified_mesh(const Object *object)