Commit: 90875f7d94ac477a4b7a0c5a22f06012b917c348
Author: Yiming Wu
Date: Tue Dec 18 11:56:01 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB90875f7d94ac477a4b7a0c5a22f06012b917c348
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr
# Conflicts:
# source/blender/makesdna/DNA_lamp_types.h
# source/blender/makesdna/DNA_scene_types.h
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index c8d48dc0388,bfba36f255b..dd7a628357e
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3003,10 -3119,9 +3119,10 @@@ class VIEW3D_MT_edit_mesh_edges_data(Me
props.use_verts = True
props.clear = True
- if with_freestyle:
+ if render.use_freestyle:
layout.separator()
+ #if with_freestyle: we still presere freestyle mark functions.
layout.operator("mesh.mark_freestyle_edge").clear = False
layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle
Edge").clear = True
diff --cc source/blender/makesdna/DNA_lamp_types.h
index 5a551f602a2,ba1fbf254c7..1baddad5a6e
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@@ -98,21 -98,21 +98,21 @@@ typedef struct Lamp
/* **************** LAMP ********************* */
/* flag */
- #define LA_DS_EXPAND 1
- /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
- * otherwise anim-editors will not read correctly
- */
- #define LA_DS_SHOW_TEXS 4
+ #define LA_DS_EXPAND (1 << 0)
+ /* NOTE: this must have the same value as MA_DS_SHOW_TEXS,
+ * otherwise anim-editors will not read correctly
+ */
+ #define LA_DS_SHOW_TEXS (1 << 2)
/* type */
-#define LA_LOCAL 0
-#define LA_SUN 1
-#define LA_SPOT 2
+#define LA_LOCAL 0
+#define LA_SUN 1
+#define LA_SPOT 2
/* #define LA_HEMI 3 */ /* not used anymore */
-#define LA_AREA 4
+#define LA_AREA 4
/* mode */
-#define LA_SHADOW (1 << 0)
+#define LA_SHADOW (1 << 0)
/* #define LA_HALO (1 << 1) */ /* not used anymore */
/* #define LA_LAYER (1 << 2) */ /* not used anymore */
/* #define LA_QUAD (1 << 3) */ /* not used anymore */
diff --cc source/blender/makesdna/DNA_scene_types.h
index 5c7ea131df9,8be63add398..5843e5753af
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1679,48 -1620,44 +1685,44 @@@ typedef struct Scene
/* **************** RENDERDATA ********************* */
/* RenderData.flag */
- /* use preview range */
-#define SCER_PRV_RANGE (1<<0)
-#define SCER_LOCK_FRAME_SELECTION (1<<1)
- /* show/use subframes (for checking motion blur) */
-#define SCER_SHOW_SUBFRAME (1<<3)
+/* use preview range */
+#define SCER_PRV_RANGE (1 << 0)
+#define SCER_LOCK_FRAME_SELECTION (1 << 1)
+/* show/use subframes (for checking motion blur) */
+#define SCER_SHOW_SUBFRAME (1 << 3)
/* RenderData.mode */
- #define R_OSA 0x0001
- /* #define R_SHADOW 0x0002 */
- /* #define R_GAMMA 0x0004 */
- /* #define R_ORTHO 0x0008 */
- /* #define R_ENVMAP 0x0010 */
- /* #define R_EDGE 0x0020 */
- /* #define R_FIELDS 0x0040 */
- /*#define R_FIELDSTILL 0x0080 */
- /*#define R_RADIO 0x0100 */ /* deprecated */
- #define R_BORDER 0x0200
- #define R_PANORAMA 0x0400 /* deprecated */
- #define R_CROP 0x0800
+ #define R_OSA (1 << 0)
+ #define R_MODE_DEPRECATED_1 (1 << 1) /* cleared */
+ #define R_MODE_DEPRECATED_2 (1 << 2) /* cleared */
+ #define R_MODE_DEPRECATED_3 (1 << 3) /* cleared */
+ #define R_MODE_DEPRECATED_4 (1 << 4) /* cleared */
+ #define R_MODE_DEPRECATED_5 (1 << 5) /* cleared */
+ #define R_MODE_DEPRECATED_6 (1 << 6) /* cleared */
+ #define R_MODE_DEPRECATED_7 (1 << 7) /* cleared */
+ #define R_MODE_DEPRECATED_8 (1 << 8) /* cleared */
+ #define R_BORDER (1 << 9)
+ #define R_MODE_DEPRECATED_10 (1 << 10) /* cleared */
+ #define R_CROP (1 << 11)
/* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
- #define R_NO_CAMERA_SWITCH 0x1000
- /* #define R_ODDFIELD 0x2000 */
- #define R_MBLUR 0x4000
- /* unified was here */
- /* #define R_RAYTRACE 0x10000 */
- /* R_GAUSS is obsolete, but used to retrieve setting from old files */
- /* #define R_GAUSS 0x20000 */
- /* fbuf obsolete... */
- /*#define R_FBUF 0x40000*/
- /* threads obsolete... is there for old files, now use for autodetect threads
*/
- #define R_THREADS 0x80000
- /* Use the same flag for autothreads */
- #define R_FIXED_THREADS 0x80000
-
- /* #define R_SPEED 0x100000 */
- /* #define R_SSS 0x200000 */
- #define R_NO_OVERWRITE 0x400000 /* skip existing files */
- #define R_TOUCH 0x800000 /* touch files before rendering */
- #define R_SIMPLIFY 0x1000000
- #define R_EDGE_FRS 0x2000000 /* R_EDGE reserved for Freestyle */
- #define R_PERSISTENT_DATA 0x4000000 /* keep data around for re-render */
- /* #define R_USE_WS_SHADING 0x8000000 */ /* use world space interpretation
of lighting data */
+ #define R_NO_CAMERA_SWITCH (1 << 12)
+ #define R_MODE_DEPRECATED_13 (1 << 13) /* cleared */
+ #define R_MBLUR (1 << 14)
+ /* unified was here */
+ #define R_MODE_DEPRECATED_16 (1 << 16) /* cleared */
+ #define R_MODE_DEPRECATED_17 (1 << 17) /* cleared */
+ #define R_MODE_DEPRECATED_18 (1 << 18) /* cleared */
+ #define R_MODE_DEPRECATED_19 (1 << 19) /* cleared */
+ #define R_FIXED_THREADS (1 << 19)
+
+ #define R_MODE_DEPRECATED_20 (1 << 20) /* cleared */
+ #define R_MODE_DEPRECATED_21 (1 << 21) /* cleared */
+ #define R_NO_OVERWRITE (1 << 22) /* skip existing files */
+ #define R_TOUCH (1 << 23) /* touch files before rendering */
+ #define R_SIMPLIFY (1 << 24)
+ #define R_EDGE_FRS (1 << 25) /* R_EDGE reserved for Freestyle */
+ #define R_PERSISTENT_DATA (1 << 26) /* keep data around for re-render */
+ #define R_MODE_DEPRECATED_27 (1 << 27) /* cleared */
/* RenderData.seq_flag */
enum {
@@@ -1825,22 -1762,22 +1827,22 @@@ enum
/* bake_mode: same as RE_BAKE_xxx defines */
/* RenderData.bake_flag */
- #define R_BAKE_CLEAR 1
- /* #define R_BAKE_OSA 2 */ /* deprecated */
- #define R_BAKE_TO_ACTIVE 4
- /* #define R_BAKE_NORMALIZE 8 */ /* deprecated */
- #define R_BAKE_MULTIRES 16
- #define R_BAKE_LORES_MESH 32
- /* #define R_BAKE_VCOL 64 */ /* deprecated */
- #define R_BAKE_USERSCALE 128
- #define R_BAKE_CAGE 256
- #define R_BAKE_SPLIT_MAT 512
- #define R_BAKE_AUTO_NAME 1024
+ #define R_BAKE_CLEAR (1 << 0)
+ /* #define R_BAKE_OSA (1 << 1) */ /* deprecated */
+ #define R_BAKE_TO_ACTIVE (1 << 2)
+ /* #define R_BAKE_NORMALIZE (1 << 3) */ /* deprecated */
+ #define R_BAKE_MULTIRES (1 << 4)
+ #define R_BAKE_LORES_MESH (1 << 5)
+ /* #define R_BAKE_VCOL (1 << 6) */ /* deprecated */
+ #define R_BAKE_USERSCALE (1 << 7)
+ #define R_BAKE_CAGE (1 << 8)
+ #define R_BAKE_SPLIT_MAT (1 << 9)
+ #define R_BAKE_AUTO_NAME (1 << 10)
/* RenderData.bake_normal_space */
-#define R_BAKE_SPACE_CAMERA 0
-#define R_BAKE_SPACE_WORLD 1
-#define R_BAKE_SPACE_OBJECT 2
+#define R_BAKE_SPACE_CAMERA 0
+#define R_BAKE_SPACE_WORLD 1
+#define R_BAKE_SPACE_OBJECT 2
#define R_BAKE_SPACE_TANGENT 3
/* RenderData.line_thickness_mode */
@@@ -1948,18 -1885,18 +1950,18 @@@ enum
};
/* ToolSettings.snap_flag */
- #define SCE_SNAP 1
- #define SCE_SNAP_ROTATE 2
- #define SCE_SNAP_PEEL_OBJECT 4
- #define SCE_SNAP_PROJECT 8
- #define SCE_SNAP_NO_SELF 16
- #define SCE_SNAP_ABS_GRID 32
+ #define SCE_SNAP (1 << 0)
+ #define SCE_SNAP_ROTATE (1 << 1)
+ #define SCE_SNAP_PEEL_OBJECT (1 << 2)
+ #define SCE_SNAP_PROJECT (1 << 3)
+ #define SCE_SNAP_NO_SELF (1 << 4)
+ #define SCE_SNAP_ABS_GRID (1 << 5)
/* ToolSettings.snap_target */
-#define SCE_SNAP_TARGET_CLOSEST 0
-#define SCE_SNAP_TARGET_CENTER 1
-#define SCE_SNAP_TARGET_MEDIAN 2
-#define SCE_SNAP_TARGET_ACTIVE 3
+#define SCE_SNAP_TARGET_CLOSEST 0
+#define SCE_SNAP_TARGET_CENTER 1
+#define SCE_SNAP_TARGET_MEDIAN 2
+#define SCE_SNAP_TARGET_ACTIVE 3
/* ToolSettings.snap_mode */
#define SCE_SNAP_MODE_VERTEX (1 << 0)
@@@ -1973,22 -1910,29 +1975,29 @@@
#define SCE_SNAP_MODE_NODE_X (1 << 6)
#define SCE_SNAP_MODE_NODE_Y (1 << 7)
+ /** #ToolSettings.snap_force_increment_flag */
+ enum {
+ SCE_SNAP_FORCE_INCREMENT_TRANSLATE = (1 << 0),
+ SCE_SNAP_FORCE_INCREMENT_ROTATE = (1 << 1),
+ SCE_SNAP_FORCE_INCREMENT_SCALE = (1 << 2),
+ };
+
/* ToolSettings.selectmode */
- #define SCE_SELECT_VERTEX 1 /* for mesh */
- #define SCE_SELECT_EDGE 2
- #define SCE_SELECT_FACE 4
+ #define SCE_SELECT_VERTEX (1 << 0) /* for mesh */
+ #define SCE_SELECT_EDGE (1 << 1)
+ #define SCE_SELECT_FACE (1 << 2)
/* MeshStatVis.type */
-#define SCE_STATVIS_OVERHANG 0
-#define SCE_STATVIS_THICKNESS 1
-#define SCE_STATVIS_INTERSECT 2
-#define SCE_STATVIS_DISTORT 3
-#define SCE_STATVIS_SHARP 4
+#define SCE_STATVIS_OVERHANG 0
+#define SCE_STATVIS_THICKNESS 1
+#define SCE_STATVIS_INTERSECT 2
+#define SCE_STATVIS_DISTORT 3
+#define SCE_STATVIS_SHARP 4
/* ParticleEditSettings.selectmode for particles */
- #define SCE_SELECT_PATH 1
- #define SCE_SELECT_POINT 2
- #define SCE_SELECT_END 4
+ #define SCE_SELECT_PATH (1 << 0)
+ #define SCE_SELECT_POINT (1 << 1)
+ #define SCE_SELECT_END (1 << 2)
/* ToolSettings.prop_mode (proportional falloff) */
#define PROP_SMOOTH 0
@@@ -2155,28 -2097,28 +2162,28 @@@ typedef enum eImagePaintMode
#define IMAGEPAINT_MISSING_STENCIL (1 << 3)
/* ToolSettings.uvcalc_flag */
- #define UVCALC_FILLHOLES 1
- #define UVCALC_NO_ASPECT_CORRECT 2 /* would call this
UVCALC_ASPECT_CORRECT, except it should be default with old file */
- #define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to
avoid distortion */
- #define UVCALC_USESUBSURF 8 /* Use mesh data after subsurf to
compute UVs*/
+ #define UVCALC_FILLHOLES (1 << 0)
+ #define UVCALC_NO_ASPECT_CORRECT (1 << 1) /* would call this
UVCALC_ASPECT_CORRECT, except it should be default with old file */
+ #define UVCALC_TRANSFORM_CORRECT (1 << 2) /* adjust UV's while
transforming to avoid distortion */
+ #define UVCALC_USESUBSURF
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
