Commit: a33a3dfd7434a7637de2613f41358f7bb8f4f37b
Author: Yiming Wu
Date: Wed Dec 12 19:02:58 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBa33a3dfd7434a7637de2613f41358f7bb8f4f37b
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/makesdna/DNA_scene_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_scene_types.h
index 6ad161b421a,c1853ce1745..5c7ea131df9
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1737,65 -1673,66 +1738,66 @@@ enum
/*#define R_OUTPUT_FORKED 4*/
/* RenderData.filtertype (used for nodes) */
-#define R_FILTER_BOX 0
-#define R_FILTER_TENT 1
-#define R_FILTER_QUAD 2
-#define R_FILTER_CUBIC 3
-#define R_FILTER_CATROM 4
-#define R_FILTER_GAUSS 5
-#define R_FILTER_MITCH 6
-#define R_FILTER_FAST_GAUSS 7
+#define R_FILTER_BOX 0
+#define R_FILTER_TENT 1
+#define R_FILTER_QUAD 2
+#define R_FILTER_CUBIC 3
+#define R_FILTER_CATROM 4
+#define R_FILTER_GAUSS 5
+#define R_FILTER_MITCH 6
+#define R_FILTER_FAST_GAUSS 7
/* RenderData.scemode (int now) */
-#define R_DOSEQ 0x0001
-#define R_BG_RENDER 0x0002
- /* passepartout is camera option now, keep this for backward
compatibility */
-#define R_PASSEPARTOUT 0x0004
-#define R_BUTS_PREVIEW 0x0008
-#define R_EXTENSION 0x0010
-#define R_MATNODE_PREVIEW 0x0020
-#define R_DOCOMP 0x0040
-#define R_COMP_CROP 0x0080
+#define R_DOSEQ 0x0001
+#define R_BG_RENDER 0x0002
+/* passepartout is camera option now, keep this for backward compatibility */
+#define R_PASSEPARTOUT 0x0004
+#define R_BUTS_PREVIEW 0x0008
+#define R_EXTENSION 0x0010
+#define R_MATNODE_PREVIEW 0x0020
+#define R_DOCOMP 0x0040
+#define R_COMP_CROP 0x0080
/* #define R_FREE_IMAGE 0x0100 */
-#define R_SINGLE_LAYER 0x0200
-#define R_EXR_TILE_FILE 0x0400
+#define R_SINGLE_LAYER 0x0200
+#define R_EXR_TILE_FILE 0x0400
/* #define R_COMP_FREE 0x0800 */
-#define R_NO_IMAGE_LOAD 0x1000
+#define R_NO_IMAGE_LOAD 0x1000
/* #define R_NO_TEX 0x2000 */
-#define R_NO_FRAME_UPDATE 0x4000
-#define R_FULL_SAMPLE 0x8000
+#define R_NO_FRAME_UPDATE 0x4000
+#define R_FULL_SAMPLE 0x8000
/* #define R_DEPRECATED 0x10000 */
/* #define R_RECURS_PROTECTION 0x20000 */
-#define R_TEXNODE_PREVIEW 0x40000
+#define R_TEXNODE_PREVIEW 0x40000
/* #define R_VIEWPORT_PREVIEW 0x80000 */
-#define R_EXR_CACHE_FILE 0x100000
-#define R_MULTIVIEW 0x200000
+#define R_EXR_CACHE_FILE 0x100000
+#define R_MULTIVIEW 0x200000
/* RenderData.stamp */
- #define R_STAMP_TIME 0x0001
- #define R_STAMP_FRAME 0x0002
- #define R_STAMP_DATE 0x0004
- #define R_STAMP_CAMERA 0x0008
- #define R_STAMP_SCENE 0x0010
- #define R_STAMP_NOTE 0x0020
- #define R_STAMP_DRAW 0x0040 /* draw in the image */
- #define R_STAMP_MARKER 0x0080
- #define R_STAMP_FILENAME 0x0100
- #define R_STAMP_SEQSTRIP 0x0200
- #define R_STAMP_RENDERTIME 0x0400
- #define R_STAMP_CAMERALENS 0x0800
- #define R_STAMP_STRIPMETA 0x1000
- #define R_STAMP_MEMORY 0x2000
- #define R_STAMP_HIDE_LABELS 0x4000
- #define R_STAMP_FRAME_RANGE 0x8000
- #define R_STAMP_ALL (R_STAMP_TIME | R_STAMP_FRAME | R_STAMP_DATE |
R_STAMP_CAMERA | R_STAMP_SCENE | \
- R_STAMP_NOTE | R_STAMP_MARKER | R_STAMP_FILENAME |
R_STAMP_SEQSTRIP | \
- R_STAMP_RENDERTIME | R_STAMP_CAMERALENS |
R_STAMP_MEMORY | \
- R_STAMP_HIDE_LABELS | R_STAMP_FRAME_RANGE)
+ #define R_STAMP_TIME 0x0001
+ #define R_STAMP_FRAME 0x0002
+ #define R_STAMP_DATE 0x0004
+ #define R_STAMP_CAMERA 0x0008
+ #define R_STAMP_SCENE 0x0010
+ #define R_STAMP_NOTE 0x0020
+ #define R_STAMP_DRAW 0x0040 /* draw in the image */
+ #define R_STAMP_MARKER 0x0080
+ #define R_STAMP_FILENAME 0x0100
+ #define R_STAMP_SEQSTRIP 0x0200
+ #define R_STAMP_RENDERTIME 0x0400
+ #define R_STAMP_CAMERALENS 0x0800
+ #define R_STAMP_STRIPMETA 0x1000
+ #define R_STAMP_MEMORY 0x2000
+ #define R_STAMP_HIDE_LABELS 0x4000
+ #define R_STAMP_FRAME_RANGE 0x8000
+ #define R_STAMP_HOSTNAME 0x10000
+ #define R_STAMP_ALL
(R_STAMP_TIME|R_STAMP_FRAME|R_STAMP_DATE|R_STAMP_CAMERA|R_STAMP_SCENE| \
+
R_STAMP_NOTE|R_STAMP_MARKER|R_STAMP_FILENAME|R_STAMP_SEQSTRIP| \
+ R_STAMP_RENDERTIME|R_STAMP_CAMERALENS|R_STAMP_MEMORY|
\
+ R_STAMP_HIDE_LABELS|R_STAMP_FRAME_RANGE|R_STAMP_HOSTNAME)
/* RenderData.alphamode */
-#define R_ADDSKY 0
-#define R_ALPHAPREMUL 1
+#define R_ADDSKY 0
+#define R_ALPHAPREMUL 1
/*#define R_ALPHAKEY 2*/ /* deprecated, shouldn't be used */
/* RenderData.color_mgt_flag */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
