ifdef'd outliner code which is spesific to gsoc pepper with '// GSOC_PEPPER' so its obvious. this will keep merging pepper changes from conflicting and can be removed when its finally merged.

1 files changed, 12 insertions, 0 deletions

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 24b7085e2f4..7026c94facc 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -50,7 +50,13 @@
 #include "DNA_scene_types.h"
 #include "DNA_world_types.h"
 #include "DNA_sequence_types.h"
+
+#if 0 // GSOC_PEPPER
+
 #include "DNA_speaker_types.h"
+
+#endif // GSOC_PEPPER
+
 #include "DNA_object_types.h"
 
 #include "BLI_blenlib.h"
@@ -715,6 +721,9 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 			}
 		}
 			break;
+
+#if 0 // GSOC_PEPPER
+
 		case ID_SPK:
 			{
 				Speaker *spk= (Speaker *)id;
@@ -723,6 +732,9 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 					outliner_add_element(soops, &te->subtree, spk, te, TSE_ANIM_DATA, 0);
 			}
 			break;
+
+#endif // GSOC_PEPPER
+
 		case ID_WO:
 		{
 			World *wrld= (World *)id;