diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-06 17:25:28 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-06 17:25:28 +0300 |
commit | bb7202495a289370fe39a9aaeebf8d21fa7d357c (patch) | |
tree | a7fd7b43a423ee3bc5fd106bba9a98a52de76262 /source/blender/editors/include | |
parent | 19d651ca9a694f556c76a09c2822b81ae1dc18a5 (diff) | |
parent | 48e871ab1d57ef2e95047b2be5718cee5d3cefe6 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureExporter.h
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentExporter.h
source/blender/collada/SceneExporter.cpp
source/blender/collada/SceneExporter.h
source/blender/collada/collada.cpp
source/blender/collada/collada.h
source/blender/editors/armature/armature_edit.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/include/ED_armature.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_screen.h
source/blender/editors/io/io_collada.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_armature.h | 9 | ||||
-rw-r--r-- | source/blender/editors/include/ED_curve.h | 11 | ||||
-rw-r--r-- | source/blender/editors/include/ED_object.h | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_screen.h | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 60374f87955..c075c89dbb2 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -42,6 +42,7 @@ struct bPoseChannel; struct Depsgraph; struct IDProperty; struct ListBase; +struct Main; struct MeshDeformModifierData; struct Mesh; struct Object; @@ -135,7 +136,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); @@ -181,11 +182,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 Object *ob, float cursor[3], int centermode, int around); +void ED_armature_origin_set(struct Main *bmain, 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 diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 74c8334322f..8fcfb4743d5 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -32,15 +32,16 @@ #define __ED_CURVE_H__ struct bContext; +struct BezTriple; +struct BPoint; +struct Curve; +struct EditNurb; +struct Main; struct Nurb; struct Object; struct Text; struct wmOperator; struct wmKeyConfig; -struct Curve; -struct EditNurb; -struct BezTriple; -struct BPoint; struct UndoType; /* curve_ops.c */ @@ -51,7 +52,7 @@ void ED_keymap_curve(struct wmKeyConfig *keyconf); /* editcurve.c */ struct ListBase *object_editcurve_get(struct Object *ob); -void ED_curve_editnurb_load(struct Object *obedit); +void ED_curve_editnurb_load(struct Main *bmain, struct Object *obedit); void ED_curve_editnurb_make(struct Object *obedit); void ED_curve_editnurb_free(struct Object *obedit); diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index c793c0aad2b..3ffab756319 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -126,7 +126,7 @@ enum { EM_NO_CONTEXT = (1 << 4), }; bool ED_object_editmode_exit_ex( - struct Scene *scene, struct Object *obedit, int flag); + struct Main *bmain, struct Scene *scene, struct Object *obedit, int flag); bool ED_object_editmode_exit(struct bContext *C, int flag); bool ED_object_editmode_enter_ex(struct Main *bmain, struct Scene *scene, struct Object *ob, int flag); diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 63485800a9b..f10e1039cd4 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -160,7 +160,7 @@ ScrArea *ED_screen_areas_iter_next(const bScreen *screen, const ScrArea *area); vert_name = (vert_name == (win)->global_areas.vertbase.last) ? (screen)->vertbase.first : vert_name->next) /* screens */ -void ED_screens_initialize(struct wmWindowManager *wm); +void ED_screens_initialize(struct Main *bmain, struct wmWindowManager *wm); void ED_screen_draw_edges(struct wmWindow *win); void ED_screen_draw_join_shape(struct ScrArea *sa1, struct ScrArea *sa2); void ED_screen_draw_split_preview(struct ScrArea *sa, const int dir, const float fac); |