[Bf-blender-cvs] [400d59be9b0] master: DNA: Add dedicated recalc flag to ID

[Sergey Sharybin]

Commit: 400d59be9b058d4bfa31a84547591275f7c700b9
Author: Sergey Sharybin
Date:   Thu Dec 14 15:12:05 2017 +0100
Branches: master
https://developer.blender.org/rB400d59be9b058d4bfa31a84547591275f7c700b9

DNA: Add dedicated recalc flag to ID

Currently unused, but this is where LIB_TAG_ID_RECALC* flags will go.

Also modified other DNA to make pointer property being followed by pointer.
Makes it easier to keep track of alignment and extend nested structures without
ruining anything.

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

M	source/blender/makesdna/DNA_ID.h
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_ID.h b/source/blender/makesdna/DNA_ID.h
index 564aa994df1..f0fc651353f 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -130,11 +130,11 @@ typedef struct ID {
 	int tag;
 	int us;
 	int icon_id;
+	int recalc;
+	int pad;
 	IDProperty *properties;
 
 	void *py_instance;
-
-	void *pad1;
 } ID;
 
 /**
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 80fa29a9c43..a9c36007d9c 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -137,6 +137,7 @@ typedef struct Object {
 	
 	bAnimVizSettings avs;	/* settings for visualization of object-transform animation */
 	bMotionPath *mpath;		/* motion path cache for this object */
+	void *pad1;
 	
 	ListBase constraintChannels  DNA_DEPRECATED; // XXX deprecated... old animation system
 	ListBase effect  DNA_DEPRECATED;             // XXX deprecated... keep for readfile
@@ -253,8 +254,6 @@ typedef struct Object {
 	int gameflag;
 	int gameflag2;
 
-	struct BulletSoftBody *bsoft;	/* settings for game engine bullet soft body */
-
 	char restrictflag;		/* for restricting view, select, render etc. accessible in outliner */
 	char recalc;			/* dependency flag */
 	short softflag;			/* softbody settings */
@@ -265,6 +264,7 @@ typedef struct Object {
 	ListBase hooks  DNA_DEPRECATED;				// XXX deprecated... old animation system
 	ListBase particlesystem;	/* particle systems */
 	
+	struct BulletSoftBody *bsoft;	/* settings for game engine bullet soft body */
 	struct PartDeflect *pd;		/* particle deflector/attractor/collision data */
 	struct SoftBody *soft;		/* if exists, saved in file */
 	struct Group *dup_group;	/* object duplicator for group */
@@ -294,6 +294,7 @@ typedef struct Object {
 
 	float ima_ofs[2];		/* offset for image empties */
 	ImageUser *iuser;		/* must be non-null when oject is an empty image */
+	void *pad3;
 
 	ListBase lodlevels;		/* contains data for levels of detail */
 	LodLevel *currentlod;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 90815b95d24..c9d4a8a5ca3 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1676,13 +1676,11 @@ typedef struct Scene {
 	/* Grease Pencil */
 	struct bGPdata *gpd;
 
-	/* Physics simulation settings */
-	struct PhysicsSettings physics_settings;
-
 	/* Movie Tracking */
 	struct MovieClip *clip;			/* active movie clip */
 
-	void *pad4;
+	/* Physics simulation settings */
+	struct PhysicsSettings physics_settings;
 
 	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 8d1bba6ca4f..17ef098a3bb 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -51,6 +51,7 @@ typedef struct Text {
 	ID id;
 	
 	char *name;
+	void *compiled;
 
 	int flags, nlines;
 	
@@ -59,9 +60,9 @@ typedef struct Text {
 	int curc, selc;
 	
 	char *undo_buf;
+	void *pad;
 	int undo_pos, undo_len;
 	
-	void *compiled;
 	double mtime;
 } Text;