diff options
Diffstat (limited to 'source/blender/io/collada/GeometryExporter.cpp')
| -rw-r--r-- | source/blender/io/collada/GeometryExporter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index c7fcc51d42f..def7caabf32 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -140,7 +140,7 @@ void GeometryExporter::operator()(Object *ob) } } - BKE_id_free(NULL, me); + BKE_id_free(nullptr, me); } void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb) @@ -350,7 +350,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, return; } - Material *ma = ob->totcol ? BKE_object_material_get(ob, material_index + 1) : NULL; + Material *ma = ob->totcol ? BKE_object_material_get(ob, material_index + 1) : nullptr; COLLADASW::PrimitivesBase *primitive_list = create_primitive_list(is_triangulated, mSW); /* sets count attribute in <polylist> */ @@ -386,7 +386,7 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, COLLADASW::Input texcoord_input( COLLADASW::InputSemantic::TEXCOORD, makeUrl(makeTexcoordSourceId(geom_id, i, this->export_settings.get_active_uv_only())), - 2, // this is only until we have optimized UV sets + 2, /* this is only until we have optimized UV sets */ (this->export_settings.get_active_uv_only()) ? 0 : layer_index - 1 /* set (0,1,2,...) */ ); til.push_back(texcoord_input); @@ -401,8 +401,8 @@ void GeometryExporter::create_mesh_primitive_list(short material_index, char *layer_name = bc_CustomData_get_layer_name(&me->ldata, CD_MLOOPCOL, a); COLLADASW::Input input4(COLLADASW::InputSemantic::COLOR, makeUrl(makeVertexColorSourceId(geom_id, layer_name)), - (has_uvs) ? 3 : 2, // all color layers have same index order - map_index // set number equals color map index + (has_uvs) ? 3 : 2, /* all color layers have same index order */ + map_index /* set number equals color map index */ ); til.push_back(input4); map_index++; @@ -636,7 +636,7 @@ void GeometryExporter::create_normals(std::vector<Normal> &normals, MVert *verts = me->mvert; MLoop *mloops = me->mloop; - float(*lnors)[3] = NULL; + float(*lnors)[3] = nullptr; bool use_custom_normals = false; BKE_mesh_calc_normals_split(me); |