[Bf-blender-cvs] [5afc102] asset-engine: Fix alignement issues in some DNA struct due to ID one now being properly aligned.

Bastien Montagne noreply at git.blender.org
Tue May 24 15:48:45 CEST 2016


Commit: 5afc1023573708bb2736c146bce6a441661269a5
Author: Bastien Montagne
Date:   Tue May 24 15:48:15 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB5afc1023573708bb2736c146bce6a441661269a5

Fix alignement issues in some DNA struct due to ID one now being properly aligned.

===================================================================

M	source/blender/makesdna/DNA_object_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesdna/DNA_text_types.h

===================================================================

diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index d53c836..47f8e8a 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -280,6 +280,7 @@ typedef struct Object {
 	struct CurveCache *curve_cache;
 
 	struct DerivedMesh *derivedDeform, *derivedFinal;
+	void *pad_v1;
 	uint64_t lastDataMask;   /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
 	uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */
 	unsigned int state;			/* bit masks of game controllers that are active */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1bf044f..427be5e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1582,6 +1582,8 @@ typedef struct Scene {
 	/* Movie Tracking */
 	struct MovieClip *clip;			/* active movie clip */
 
+	void *pad_v1;
+
 	uint64_t customdata_mask;	/* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */
 	uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */
 
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 8d1bba6..7527912 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -62,6 +62,7 @@ typedef struct Text {
 	int undo_pos, undo_len;
 	
 	void *compiled;
+	void *pad_v1;
 	double mtime;
 } Text;




More information about the Bf-blender-cvs mailing list