Merged changes in the trunk up to revision 55357.
[blender.git] / source / blender / blenkernel / intern / linestyle.c
index aa9200adef4e69d7262726462b2ca9b99d93715a..ca3a910f403effea9a7dc109f61b20b7cec9b847 100644 (file)
 #include "DNA_material_types.h" /* for ramp blend */
 #include "DNA_texture_types.h"
 
 #include "DNA_material_types.h" /* for ramp blend */
 #include "DNA_texture_types.h"
 
+#include "BLI_blenlib.h"
+#include "BLI_math.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_linestyle.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
 #include "BKE_linestyle.h"
@@ -47,9 +51,6 @@
 #include "BKE_colortools.h"
 #include "BKE_animsys.h"
 
 #include "BKE_colortools.h"
 #include "BKE_animsys.h"
 
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
-
 static const char *modifier_name[LS_MODIFIER_NUM] = {
        NULL,
        "Along Stroke",
 static const char *modifier_name[LS_MODIFIER_NUM] = {
        NULL,
        "Along Stroke",