[Bf-blender-cvs] [d00d2bd3080] soc-2020-io-performance: Mark OBJRawObject const in add_object_to_parent.
Ankit Meel
noreply at git.blender.org
Sun Jul 12 15:41:05 CEST 2020
Commit: d00d2bd308027264b1a15391fb48555fa716947a
Author: Ankit Meel
Date: Sun Jul 12 18:48:47 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBd00d2bd308027264b1a15391fb48555fa716947a
Mark OBJRawObject const in add_object_to_parent.
===================================================================
M source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
===================================================================
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
index 0c952eb06ed..82358bdddbc 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -201,7 +201,8 @@ OBJParentCollection::OBJParentCollection(Main *bmain, Scene *scene) : bmain_(bma
bmain_, scene_->master_collection, "OBJ import collection");
}
-void OBJParentCollection::add_object_to_parent(OBJRawObject &ob_to_add, std::unique_ptr<Mesh> mesh)
+void OBJParentCollection::add_object_to_parent(const OBJRawObject &ob_to_add,
+ std::unique_ptr<Mesh> mesh)
{
std::unique_ptr<Object> b_object{
BKE_object_add_only_object(bmain_, OB_MESH, ob_to_add.object_name.c_str())};
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
index 31f3815f2f0..89d5c39896b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
@@ -64,7 +64,7 @@ class OBJRawObject {
class OBJParentCollection {
public:
OBJParentCollection(Main *bmain, Scene *scene);
- void add_object_to_parent(OBJRawObject &ob_to_add, std::unique_ptr<Mesh> mesh);
+ void add_object_to_parent(const OBJRawObject &ob_to_add, std::unique_ptr<Mesh> mesh);
private:
Main *bmain_;
More information about the Bf-blender-cvs
mailing list