12 files changed, 11 insertions, 11 deletions
diff --git a/source/Makefile b/source/Makefile
index fedf438d4cc..3ffc9fd2134 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -233,7 +233,7 @@ PULIB += $(OCGDIR)/blender/ed_info/libed_info.a
 PULIB += $(OCGDIR)/blender/ed_buttons/libed_buttons.a
 PULIB += $(OCGDIR)/blender/ed_node/libed_node.a
 PULIB += $(OCGDIR)/blender/ed_image/libed_image.a
-PULIB += $(OCGDIR)/blender/ed_ipo/libed_ipo.a
+PULIB += $(OCGDIR)/blender/ed_graph/libed_graph.a
 PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a
 PULIB += $(OCGDIR)/blender/ed_time/libed_time.a
 PULIB += $(OCGDIR)/blender/ed_preview/libed_preview.a
diff --git a/source/blender/editors/Makefile b/source/blender/editors/Makefile
index af446811d6f..312227ba4e9 100644
--- a/source/blender/editors/Makefile
+++ b/source/blender/editors/Makefile
@@ -29,6 +29,6 @@
 # Bounces make to subdirectories.
 
 SOURCEDIR = source/blender/editors
-DIRS = armature mesh animation object sculpt datafiles transform screen curve gpencil physics preview uvedit space_outliner space_time space_view3d interface util  space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer
+DIRS = armature mesh animation object sculpt datafiles transform screen curve gpencil physics preview uvedit space_outliner space_time space_view3d interface util  space_api space_graph space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer
 
 include nan_subdirs.mk
diff --git a/source/blender/editors/SConscript b/source/blender/editors/SConscript
index fc71319afa1..8346092976e 100644
--- a/source/blender/editors/SConscript
+++ b/source/blender/editors/SConscript
@@ -18,7 +18,7 @@ SConscript(['datafiles/SConscript',
 			'space_file/SConscript',
 			'space_image/SConscript',
 			'space_info/SConscript',
-			'space_ipo/SConscript',
+			'space_graph/SConscript',
 			'space_node/SConscript',
 			'space_outliner/SConscript',
 			'space_time/SConscript',
diff --git a/source/blender/editors/space_ipo/Makefile b/source/blender/editors/space_graph/Makefile
index a1c15ff3225..340495ecc79 100644
--- a/source/blender/editors/space_ipo/Makefile
+++ b/source/blender/editors/space_graph/Makefile
@@ -28,7 +28,7 @@
 #
 # Makes module object directory and bounces make to subdirectories.
 
-LIBNAME = ed_ipo
+LIBNAME = ed_graph
 DIR = $(OCGDIR)/blender/$(LIBNAME)
 
 include nan_compile.mk
diff --git a/source/blender/editors/space_ipo/SConscript b/source/blender/editors/space_graph/SConscript
index 1ff259b5757..cc9812678e9 100644
--- a/source/blender/editors/space_ipo/SConscript
+++ b/source/blender/editors/space_graph/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('*.c')
 incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 
-env.BlenderLib ( 'bf_editors_space_ipo', sources, Split(incs), [], libtype=['core'], priority=[50] )
+env.BlenderLib ( 'bf_editors_space_graph', sources, Split(incs), [], libtype=['core'], priority=[50] )
diff --git a/source/blender/editors/space_ipo/ipo_draw.c b/source/blender/editors/space_graph/graph_draw.c
index e9566506059..6ccfae88b08 100644
--- a/source/blender/editors/space_ipo/ipo_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -76,7 +76,7 @@
 #include "ED_anim_api.h"
 #include "ED_util.h"
 
-#include "ipo_intern.h"
+#include "graph_intern.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
diff --git a/source/blender/editors/space_ipo/ipo_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 94e8b6e4f0b..a7b9e8aa883 100644
--- a/source/blender/editors/space_ipo/ipo_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -82,7 +82,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ipo_intern.h"
+#include "graph_intern.h"
 
 #if 0 // XXX code to be sanitied for new system
 
diff --git a/source/blender/editors/space_ipo/ipo_header.c b/source/blender/editors/space_graph/graph_header.c
index 0135a274372..3e856833954 100644
--- a/source/blender/editors/space_ipo/ipo_header.c
+++ b/source/blender/editors/space_graph/graph_header.c
@@ -57,7 +57,7 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-#include "ipo_intern.h"
+#include "graph_intern.h"
 
 /* ********************************************************* */
 /* Menu Defines... */
diff --git a/source/blender/editors/space_ipo/ipo_intern.h b/source/blender/editors/space_graph/graph_intern.h
index f44f2174462..f44f2174462 100644
--- a/source/blender/editors/space_ipo/ipo_intern.h
+++ b/source/blender/editors/space_graph/graph_intern.h
diff --git a/source/blender/editors/space_ipo/ipo_ops.c b/source/blender/editors/space_graph/graph_ops.c
index a829a8630ea..9c7fa307a7f 100644
--- a/source/blender/editors/space_ipo/ipo_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -50,7 +50,7 @@
 
 #include "BIF_transform.h"
 
-#include "ipo_intern.h"
+#include "graph_intern.h"
 
 #include "RNA_access.h"
 #include "RNA_define.h"
diff --git a/source/blender/editors/space_ipo/ipo_select.c b/source/blender/editors/space_graph/graph_select.c
index fff40f1c739..2a9cab17e3a 100644
--- a/source/blender/editors/space_ipo/ipo_select.c
+++ b/source/blender/editors/space_graph/graph_select.c
@@ -79,7 +79,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ipo_intern.h"
+#include "graph_intern.h"
 
 
 /* ************************************************************************** */
diff --git a/source/blender/editors/space_ipo/space_ipo.c b/source/blender/editors/space_graph/space_graph.c
index 387304bb02c..4162b81974d 100644
--- a/source/blender/editors/space_ipo/space_ipo.c
+++ b/source/blender/editors/space_graph/space_graph.c
@@ -58,7 +58,7 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-#include "ipo_intern.h"	// own include
+#include "graph_intern.h"	// own include
 
 /* ******************** default callbacks for ipo space ***************** */