Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-02-05 16:50:01 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-02-05 16:50:01 +0400
commitb0d39d83b9cd4c1752684080b0c264d302d67154 (patch)
treefc6aa61a9080d81548ec77cf2d859973b07f7afb /source/blender/makesdna/DNA_freestyle_types.h
parent29db9103e9c85356a057166be4f71c778cd97a45 (diff)
Unified "Ridge" and "Valley" into "Ridge & Valley" in the Parameter Editor mode.
The Valley edge type is merely an alias of Ridge in the present Freestyle implementation.
Diffstat (limited to 'source/blender/makesdna/DNA_freestyle_types.h')
-rw-r--r--source/blender/makesdna/DNA_freestyle_types.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
index 9d56209f9f4..f6e9421fa34 100644
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -47,7 +47,7 @@ struct FreestyleLineStyle;
#define FREESTYLE_CONTROL_EDITOR_MODE 2
/* FreestyleLineSet::flags */
-#define FREESTYLE_LINESET_CURRENT 1
+#define FREESTYLE_LINESET_CURRENT 1l
#define FREESTYLE_LINESET_ENABLED 2
#define FREESTYLE_LINESET_FE_NOT 4
#define FREESTYLE_LINESET_FE_AND 8
@@ -66,8 +66,8 @@ struct FreestyleLineStyle;
#define FREESTYLE_FE_SILHOUETTE 1
#define FREESTYLE_FE_BORDER 2
#define FREESTYLE_FE_CREASE 4
-#define FREESTYLE_FE_RIDGE 8
-#define FREESTYLE_FE_VALLEY 16
+#define FREESTYLE_FE_RIDGE_VALLEY 8
+/* Note: FREESTYLE_FE_VALLEY = 16 is no longer used */
#define FREESTYLE_FE_SUGGESTIVE_CONTOUR 32
#define FREESTYLE_FE_MATERIAL_BOUNDARY 64
#define FREESTYLE_FE_CONTOUR 128