Merged changes in the trunk up to revision 54110.
[blender.git] / source / blender / render / intern / include / render_types.h
index d65da586b9a9717b14ea5c5f9ca455d7a27b71e0..deba6d165f28856e177d2e64fad6a7ed0c249068 100644 (file)
@@ -235,6 +235,10 @@ struct Render
        ListBase volumes;
        ListBase volume_precache_parts;
 
+#ifdef WITH_FREESTYLE
+       ListBase freestyle_renders;
+#endif
+
        /* arena for allocating data for use during render, for
         * example dynamic TFaces to go in the VlakRen structure.
         */
@@ -390,6 +394,9 @@ typedef struct VlakRen {
        struct Material *mat;
        char puno;
        char flag, ec;
+#ifdef WITH_FREESTYLE
+       char freestyle_edge_mark;
+#endif
        int index;
 } VlakRen;
 
@@ -622,6 +629,15 @@ typedef struct LampRen {
 #define R_TANGENT              64              
 #define R_TRACEBLE             128
 
+/* vlakren->freestyle_edge_mark */
+#ifdef WITH_FREESTYLE
+#  define R_EDGE_V1V2          1
+#  define R_EDGE_V2V3          2
+#  define R_EDGE_V3V4          4
+#  define R_EDGE_V3V1          4
+#  define R_EDGE_V4V1          8
+#endif
+
 /* strandbuffer->flag */
 #define R_STRAND_BSPLINE       1
 #define R_STRAND_B_UNITS       2