[Bf-blender-cvs] [bc66ca2] render-layers: DNA fixups

Dalai Felinto noreply at git.blender.org
Fri Dec 2 17:56:09 CET 2016


Commit: bc66ca246c0d95f1b56bae1f08af566110664330
Author: Dalai Felinto
Date:   Fri Dec 2 11:33:43 2016 +0100
Branches: render-layers
https://developer.blender.org/rBbc66ca246c0d95f1b56bae1f08af566110664330

DNA fixups

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

M	source/blender/makesdna/DNA_layer_types.h
M	source/blender/makesdna/intern/makesdna.c

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

diff --git a/source/blender/makesdna/DNA_layer_types.h b/source/blender/makesdna/DNA_layer_types.h
index e0f8127..602cea0 100644
--- a/source/blender/makesdna/DNA_layer_types.h
+++ b/source/blender/makesdna/DNA_layer_types.h
@@ -37,6 +37,7 @@ typedef struct ObjectBase {
 	struct ObjectBase *next, *prev;
 	short flag;
 	short refcount;
+	short pad[2];
 	struct Object *object;
 } ObjectBase;
 
@@ -70,6 +71,7 @@ typedef struct SceneLayer {
 	char name[64]; /* MAX_NAME */
 	char engine[32]; /* render engine */
 	short active_collection;
+	short pad[3];
 	struct ObjectBase *basact;
 	ListBase collection_bases;
 	ListBase object_bases;
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 0f7ed8c..a3dff56 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -128,6 +128,7 @@ static const char *includefiles[] = {
 	"DNA_freestyle_types.h",
 	"DNA_linestyle_types.h",
 	"DNA_cachefile_types.h",
+	"DNA_layer_types.h",
 	/* see comment above before editing! */
 
 	/* empty string to indicate end of includefiles */
@@ -1338,4 +1339,5 @@ int main(int argc, char **argv)
 #include "DNA_freestyle_types.h"
 #include "DNA_linestyle_types.h"
 #include "DNA_cachefile_types.h"
+#include "DNA_layer_types.h"
 /* end of list */




More information about the Bf-blender-cvs mailing list