Commit: 062d322df17210fdb4b99a3e0723c608362b2491 Author: Sybren A. Stüvel Date: Tue Feb 21 15:00:27 2017 +0100 Branches: temp-sybren-alembic https://developer.blender.org/rB062d322df17210fdb4b99a3e0723c608362b2491
Alembic: more const-ness =================================================================== M source/blender/alembic/intern/abc_util.cc M source/blender/alembic/intern/abc_util.h =================================================================== diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 2c9f0f1117..da081f5b6d 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -39,7 +39,7 @@ extern "C" { #include "BLI_math.h" } -std::string get_id_name(Object *ob) +std::string get_id_name(const Object * const ob) { if (!ob) { return ""; @@ -48,7 +48,7 @@ std::string get_id_name(Object *ob) return get_id_name(&ob->id); } -std::string get_id_name(ID *id) +std::string get_id_name(const ID * const id) { std::string name(id->name + 2); std::replace(name.begin(), name.end(), ' ', '_'); @@ -58,7 +58,7 @@ std::string get_id_name(ID *id) return name; } -std::string get_object_dag_path_name(Object *ob, Object *dupli_parent) +std::string get_object_dag_path_name(const Object * const ob, Object *dupli_parent) { std::string name = get_id_name(ob); diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index e700cc39a2..4a5561b47a 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -44,9 +44,9 @@ struct ImportSettings; struct ID; struct Object; -std::string get_id_name(ID *id); -std::string get_id_name(Object *ob); -std::string get_object_dag_path_name(Object *ob, Object *dupli_parent); +std::string get_id_name(const ID * const id); +std::string get_id_name(const Object * const ob); +std::string get_object_dag_path_name(const Object * const ob, Object *dupli_parent); bool object_selected(Object *ob); bool parent_selected(Object *ob); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs