diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 19:26:50 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-12 19:26:50 +0300 |
| commit | 9b9b943e0c7fb5c921a54521c4a7c55f7a7f22ba (patch) | |
| tree | be92f33358c8930902c708ce213e6a7fbeb7692f /source/blender/editors/armature/pose_utils.c | |
| parent | a76cfe2c22ed5142a481d89bf85e4b620604ae50 (diff) | |
| parent | 27882024176a3015e36305d19a763571e1a8c731 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/armature/pose_utils.c
source/blender/editors/include/ED_armature.h
source/blender/editors/object/object_edit.c
source/blender/editors/transform/transform_conversions.c
Diffstat (limited to 'source/blender/editors/armature/pose_utils.c')
| -rw-r--r-- | source/blender/editors/armature/pose_utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/armature/pose_utils.c b/source/blender/editors/armature/pose_utils.c index b64c8528010..e280284a9ce 100644 --- a/source/blender/editors/armature/pose_utils.c +++ b/source/blender/editors/armature/pose_utils.c @@ -40,6 +40,7 @@ #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_idprop.h" +#include "BKE_main.h" #include "BKE_context.h" |