diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-06 16:50:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 12:11:46 +0300 |
commit | 54f9cd52835bdd96cdd01cf643cfccf8a229c04b (patch) | |
tree | 95095d556c91743b9012387726fbdccc61f38c00 /source/blender/editors/include/ED_armature.h | |
parent | 409cfba1a3cdec228c7f93aa8c1fbc912a6d6525 (diff) |
Cleanup: Nuke moar G.main usages...
Diffstat (limited to 'source/blender/editors/include/ED_armature.h')
-rw-r--r-- | source/blender/editors/include/ED_armature.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 51fb5abedd2..11c389bbb1a 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -41,6 +41,7 @@ struct Bone; struct bPoseChannel; struct IDProperty; struct ListBase; +struct Main; struct MeshDeformModifierData; struct DerivedMesh; struct Object; @@ -126,7 +127,7 @@ void ED_operatormacros_armature(void); void ED_keymap_armature(struct wmKeyConfig *keyconf); /* editarmature.c */ -void ED_armature_from_edit(struct bArmature *arm); +void ED_armature_from_edit(struct Main *bmain, struct bArmature *arm); void ED_armature_to_edit(struct bArmature *arm); void ED_armature_edit_free(struct bArmature *arm); @@ -162,11 +163,11 @@ void ED_armature_ebone_from_mat3(EditBone *ebone, float mat[3][3]); void ED_armature_ebone_from_mat4(EditBone *ebone, float mat[4][4]); void ED_armature_edit_transform_mirror_update(struct Object *obedit); -void ED_armature_origin_set(struct Scene *scene, struct Object *ob, float cursor[3], int centermode, int around); +void ED_armature_origin_set(struct Main *bmain, struct Scene *scene, struct Object *ob, float cursor[3], int centermode, int around); void ED_armature_transform_bones(struct bArmature *arm, float mat[4][4], const bool do_props); -void ED_armature_transform_apply(struct Object *ob, float mat[4][4], const bool do_props); -void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do_props); +void ED_armature_transform_apply(struct Main *bmain, struct Object *ob, float mat[4][4], const bool do_props); +void ED_armature_transform(struct Main *bmain, struct bArmature *arm, float mat[4][4], const bool do_props); #define ARM_GROUPS_NAME 1 #define ARM_GROUPS_ENVELOPE 2 |