diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-29 00:58:57 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-11-29 00:58:57 +0300 |
| commit | 137fd5ffcba7f049e50200114da8e231cc136189 (patch) | |
| tree | adeca4ed58480845bf8ef93783ca81eccef32522 /source/blender/makesdna | |
| parent | 1261f8eaa7d60554d8678ca2256f123951ed509d (diff) | |
| parent | 0c7fbc435f4611d6f25a58b17f7f65318bef572d (diff) | |
Merge branch 'master' into split-kernel-faster-building
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_ID.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 9 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 5250749fce3..923df70dd4d 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -339,7 +339,7 @@ enum { * Also used internally in readfile.c to mark datablocks needing do_versions. */ LIB_TAG_NEW = 1 << 8, /* RESET_BEFORE_USE free test flag. - * TODO make it a RESET_AFTER_USE too. */ + * TODO make it a RESET_AFTER_USE too. */ LIB_TAG_DOIT = 1 << 10, /* RESET_AFTER_USE tag existing data before linking so we know what is new. */ LIB_TAG_PRE_EXISTING = 1 << 11, diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index b9f19a36072..90815b95d24 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1744,9 +1744,12 @@ typedef struct Scene { #define R_USE_WS_SHADING 0x8000000 /* use world space interpretation of lighting data */ /* seq_flag */ -// #define R_SEQ_GL_PREV 1 // UNUSED, we just use setting from seq_prev_type now. -// #define R_SEQ_GL_REND 2 // UNUSED, opengl render has its own operator now. -#define R_SEQ_SOLID_TEX 4 +enum { + // R_SEQ_GL_PREV = (1 << 1), // UNUSED, we just use setting from seq_prev_type now. + // R_SEQ_GL_REND = (1 << 2), // UNUSED, opengl render has its own operator now. + R_SEQ_SOLID_TEX = (1 << 3), + R_SEQ_CAMERA_DOF = (1 << 4), +}; /* displaymode */ diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index a0f77d61d1d..015583d898c 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -512,6 +512,9 @@ typedef struct SpaceSeq { char multiview_eye; /* multiview current eye - for internal use */ char pad2[7]; + + struct GPUFX *compositor; + void *pad3; } SpaceSeq; diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 2cea8715a65..17e30de4509 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -978,7 +978,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs char str[SDNA_MAX_FILENAME_LENGTH], *cp; int firststruct; - if (debugSDNA > -1) { + if (debugSDNA > 0) { fflush(stdout); printf("Running makesdna at debug level %d\n", debugSDNA); } @@ -1074,7 +1074,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs /* file writing */ - if (debugSDNA > -1) printf("Writing file ... "); + if (debugSDNA > 0) printf("Writing file ... "); if (nr_names == 0 || nr_structs == 0) { /* pass */ @@ -1184,7 +1184,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs MEM_freeN(typelens_64); MEM_freeN(structs); - if (debugSDNA > -1) printf("done.\n"); + if (debugSDNA > 0) printf("done.\n"); return(0); } |