1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/render/extern/include/RE_bake.h b/source/blender/render/extern/include/RE_bake.h
index 481da452529..0750ea1aa28 100644
--- a/source/blender/render/extern/include/RE_bake.h
+++ b/source/blender/render/extern/include/RE_bake.h
@@ -32,6 +32,7 @@
 #ifndef __RE_BAKE_H__
 #define __RE_BAKE_H__
 
+struct ImBuf;
 struct Render;
 struct Mesh;
 
@@ -49,29 +50,28 @@ typedef struct BakeImages {
 } BakeImages;
 
 typedef struct BakePixel {
-	int primitive_id;
+	int primitive_id, object_id;
 	float uv[2];
 	float du_dx, du_dy;
 	float dv_dx, dv_dy;
 } BakePixel;
 
 typedef struct BakeHighPolyData {
-	struct BakePixel *pixel_array;
 	struct Object *ob;
 	struct ModifierData *tri_mod;
 	struct Mesh *me;
 	char restrict_flag;
+	bool is_flip_object;
 
 	float obmat[4][4];
 	float imat[4][4];
-	float rotmat[4][4];
 } BakeHighPolyData;
 
 /* external_engine.c */
 bool RE_bake_has_engine(struct Render *re);
 
 bool RE_bake_engine(
-        struct Render *re, struct Object *object, const BakePixel pixel_array[],
+        struct Render *re, struct Object *object, const int object_id, const BakePixel pixel_array[],
         const size_t num_pixels, const int depth, const ScenePassType pass_type, float result[]);
 
 /* bake.c */
@@ -81,7 +81,7 @@ bool RE_bake_internal(
         const size_t num_pixels, const int depth, const ScenePassType pass_type, float result[]);
 
 bool RE_bake_pixels_populate_from_objects(
-        struct Mesh *me_low, BakePixel pixel_array_from[],
+        struct Mesh *me_low, BakePixel pixel_array_from[], BakePixel pixel_array_to[],
         BakeHighPolyData highpoly[], const int tot_highpoly, const size_t num_pixels, const bool is_custom_cage,
         const float cage_extrusion, float mat_low[4][4], float mat_cage[4][4], struct Mesh *me_cage);