Revision: 31040
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31040
Author: kjym3
Date: 2010-08-04 16:06:30 +0200 (Wed, 04 Aug 2010)
Log Message:
-----------
Made the logical OR the default logical operator for combining
edge selection conditions.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
Modified:
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h
2010-08-04 13:59:25 UTC (rev 31039)
+++ branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h
2010-08-04 14:06:30 UTC (rev 31040)
@@ -48,7 +48,7 @@
#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
Modified: branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2010-08-04 13:59:25 UTC (rev 31039)
+++ branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
2010-08-04 14:06:30 UTC (rev 31040)
@@ -1567,8 +1567,8 @@
{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[] = {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
