[Bf-blender-cvs] [ec435c813d4] refactor-mesh-material-index-generic: Cleanup: Add using namespaces
Hans Goudey
noreply at git.blender.org
Sat Aug 27 07:31:10 CEST 2022
Commit: ec435c813d475e94337c8f7c28f96a4476bbee96
Author: Hans Goudey
Date: Sat Aug 27 00:30:32 2022 -0500
Branches: refactor-mesh-material-index-generic
https://developer.blender.org/rBec435c813d475e94337c8f7c28f96a4476bbee96
Cleanup: Add using namespaces
===================================================================
M source/blender/blenkernel/intern/gpencil_geom.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc
index 51164c20598..85ff81ba80e 100644
--- a/source/blender/blenkernel/intern/gpencil_geom.cc
+++ b/source/blender/blenkernel/intern/gpencil_geom.cc
@@ -2663,6 +2663,8 @@ bool BKE_gpencil_convert_mesh(Main *bmain,
const bool use_faces,
const bool use_vgroups)
{
+ using namespace blender;
+ using namespace blender::bke;
if (ELEM(nullptr, ob_gp, ob_mesh) || (ob_gp->type != OB_GPENCIL) || (ob_gp->data == nullptr)) {
return false;
}
@@ -2710,9 +2712,8 @@ bool BKE_gpencil_convert_mesh(Main *bmain,
gpl_fill, scene->r.cfra + frame_offset, GP_GETFRAME_ADD_NEW);
int i;
- const blender::VArray<int> mesh_material_indices =
- blender::bke::mesh_attributes(*me_eval).lookup_or_default<int>(
- "material_index", ATTR_DOMAIN_FACE, 0);
+ const VArray<int> mesh_material_indices = mesh_attributes(*me_eval).lookup_or_default<int>(
+ "material_index", ATTR_DOMAIN_FACE, 0);
for (i = 0; i < mpoly_len; i++) {
const MPoly *mp = &mpoly[i];
More information about the Bf-blender-cvs
mailing list