A WIP commit for proof-of-concept implementations of line style modifiers.

A number of UI elements were newly introduced to control line color, alpha
transparency and line thickness by means of base color/alpha/thickness plus
modifiers that alter the base values.  To begin with, three basic modifiers
were prototyped with the aim of putting the new UI framework in practice
and evaluating if it works properly.

The Parameter Editor mode is still in a work-in-progress state and totally
useless from users' viewpoint.

1 files changed, 33 insertions, 8 deletions

diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h
index e415d580c4d..bf8b77e8a08 100644
--- a/source/blender/makesdna/DNA_freestyle_types.h
+++ b/source/blender/makesdna/DNA_freestyle_types.h
@@ -1,8 +1,39 @@
+/* DNA_freestyle_types.h
+ *
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
 #ifndef DNA_FREESTYLE_TYPES_H
 #define DNA_FREESTYLE_TYPES_H
 
 #include "DNA_listBase.h"
-#include "DNA_ID.h"
+
+struct FreestyleLineStyle;
 
 /* FreestyleConfig::flags */
 #define FREESTYLE_SUGGESTIVE_CONTOURS_FLAG  1
@@ -39,11 +70,6 @@
 #define FREESTYLE_QI_HIDDEN   2
 #define FREESTYLE_QI_RANGE    3
 
-typedef struct FreestyleLineStyle {
-	ID id;
-
-} FreestyleLineStyle;
-
 typedef struct FreestyleLineSet {
 	struct FreestyleLineSet *next, *prev;
 
@@ -56,7 +82,7 @@ typedef struct FreestyleLineSet {
 	int qi_start, qi_end;
 	int edge_types; /* feature edge types */
 
-	FreestyleLineStyle *linestyle; /* line style */
+	struct FreestyleLineStyle *linestyle;
 
 	ListBase objects; /* target objects on which stylized lines are drawn */
 
@@ -86,4 +112,3 @@ typedef struct FreestyleConfig {
 } FreestyleConfig;
 
 #endif
-