Cycles: svn merge -r41182:41205 ^/trunk/blender

[blender-staging.git] / source / blender / editors / space_node / node_edit.c

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 83f15243ebe000c1f5dfde51fb187c3ba05920c7..7fb81e77bcbfc8cfb92bf7cbe324735c6626647a 100644 (file)
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -51,7 +51,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"

-#include "BLI_storage_types.h"

 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_context.h"


@@ -69,11 +68,6 @@
 #include "BKE_texture.h"
 #include "BKE_report.h"
 
 #include "BKE_texture.h"
 #include "BKE_report.h"
 

-
-#include "BLI_math.h"
-#include "BLI_blenlib.h"
-#include "BLI_storage_types.h"
-

 #include "RE_pipeline.h"
 
 #include "IMB_imbuf_types.h"
 #include "RE_pipeline.h"
 
 #include "IMB_imbuf_types.h"