orange: cleaning up / (msvc) compile fixes to the new editnla functions (experimental / made for baking and AvailRot/Loc keying methods)

4 files changed, 8 insertions, 2 deletions

diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index b6e0aded1b8..0189b7a2826 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -132,6 +132,9 @@ struct bActionChannel *get_action_channel(struct bAction *act,  const char *name
  */
 struct bActionChannel *verify_action_channel(struct bAction *act, const char *name);
 
+  /* baking */
+struct bAction *bake_obIPO_to_action(struct Object *ob);
+
 /* exported for game engine */
 void blend_poses(struct bPose *dst, struct bPose *src, float srcweight, short mode);
 void extract_pose_from_pose(struct bPose *pose, const struct bPose *src);
diff --git a/source/blender/include/BIF_editnla.h b/source/blender/include/BIF_editnla.h
index 1b62de6a317..4cd9a136c2a 100644
--- a/source/blender/include/BIF_editnla.h
+++ b/source/blender/include/BIF_editnla.h
@@ -54,6 +54,8 @@ void reset_action_strips(int val);
 void synchronize_action_strips(void);
 void snap_action_strips(void);
 
+/* Baking */
+void bake_all_to_action(void);
 
 #endif
 
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index c1e9cf60b76..ec740c5f75b 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -69,6 +69,7 @@
 #include "BKE_library.h"
 #include "BKE_main.h"
 #include "BKE_utildefines.h"
+#include "BKE_object.h" /* for where_is_object in obanim -> action baking */
 
 #include "BIF_butspace.h"
 #include "BIF_editaction.h"
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 1679d274d2c..d7c505a7f1c 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -1847,8 +1847,8 @@ static void add_nla_block_by_name(char name[32], Object *ob, short hold, short a
 void bake_all_to_action(void)
 {
 	Object		*ob;
-	bAction		*newAction=NULL;
-	Ipo		*ipo=NULL;
+	bAction		*newAction;
+	Ipo		*ipo;
 	ID		*id;
 	short		hold, add;
 	float		repeat;