diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-14 16:15:51 +0300 |
commit | fd19069999e3655206ccf21dc851801a325dea5d (patch) | |
tree | 54d5d865c13e42ef50829e6358afdf5790d2df74 /source/blender/collada/collada_utils.h | |
parent | 66407e15cb5136bdbed45b9e0576b1e9863c3f4f (diff) |
Cleanup: remove last G.main's from Collada code.
Diffstat (limited to 'source/blender/collada/collada_utils.h')
-rw-r--r-- | source/blender/collada/collada_utils.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index cbce74485b7..438bb4a0f98 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -63,15 +63,15 @@ extern "C" { typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex *> > TexIndexTextureArrayMap; -extern Main *bc_get_main(); -extern EvaluationContext *bc_get_evaluation_context(); -extern void bc_update_scene(Scene *scene, float ctime); +extern EvaluationContext *bc_get_evaluation_context(Main *bmain); +extern void bc_update_scene(Main *bmain, Scene *scene, float ctime); extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index); extern int bc_test_parent_loop(Object *par, Object *ob); extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space = true); -extern Object *bc_add_object(Scene *scene, int type, const char *name); -extern Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); +extern Object *bc_add_object(Main *bmain, Scene *scene, int type, const char *name); +extern Mesh *bc_get_mesh_copy( + Main *bmain, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); extern Object *bc_get_assigned_armature(Object *ob); extern Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob); |