diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-04 18:06:30 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-04 18:06:30 +0400 |
| commit | 9284d67559e03fe6a7bd8fc9f787f39d64dabe69 (patch) | |
| tree | 2f51f27bcbb64cc27342a8ef5f5460dfd1b574c0 /source | |
| parent | a5692fd67bedf71f849d330c83239a47ad93e3e7 (diff) | |
Made the logical OR the default logical operator for combining
edge selection conditions.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/makesdna/DNA_freestyle_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
2 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 bf8b77e8a08..08980afec89 100644 --- a/source/blender/makesdna/DNA_freestyle_types.h +++ b/source/blender/makesdna/DNA_freestyle_types.h @@ -48,7 +48,7 @@ struct FreestyleLineStyle; #define FREESTYLE_LINESET_CURRENT 1 #define FREESTYLE_LINESET_ENABLED 2 #define FREESTYLE_LINESET_FE_NOT 4 -#define FREESTYLE_LINESET_FE_OR 8 +#define FREESTYLE_LINESET_FE_AND 8 /* FreestyleLineSet::selection */ #define FREESTYLE_SEL_VISIBILITY 1 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 5aab403e71a..eea426ceb0c 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1567,8 +1567,8 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem combination_items[] = { - {0, "AND", 0, "Logical AND", "Combine feature edge type conditions by logical AND (logical conjunction)."}, - {FREESTYLE_LINESET_FE_OR, "OR", 0, "Logical OR", "Combine feature edge type conditions by logical OR (logical disjunction)."}, + {0, "OR", 0, "Logical OR", "Combine feature edge type conditions by logical OR (logical disjunction)."}, + {FREESTYLE_LINESET_FE_AND, "AND", 0, "Logical AND", "Combine feature edge type conditions by logical AND (logical conjunction)."}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem freestyle_ui_mode_items[] = { |