diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:50:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:50:05 +0400 |
| commit | 0fac849d44d5bf8f2d3add9e10c03adbe5ffe331 (patch) | |
| tree | 286c9af2a5eb7d1325eade0cde16abfeb4596b6c /source/blender/editors/space_outliner/outliner_ops.c | |
| parent | e97617e3fbf2281326ba471fc72c71b52f8b0fdb (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_ops.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_ops.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index b79bb000201..f3e2c352172 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -58,8 +58,13 @@ void outliner_operatortypes(void) WM_operatortype_append(OUTLINER_OT_id_operation); WM_operatortype_append(OUTLINER_OT_data_operation); WM_operatortype_append(OUTLINER_OT_animdata_operation); + +#if 0 // GSOC_PEPPER + WM_operatortype_append(OUTLINER_OT_action_set); +#endif // GSOC_PEPPER + WM_operatortype_append(OUTLINER_OT_show_one_level); WM_operatortype_append(OUTLINER_OT_show_active); WM_operatortype_append(OUTLINER_OT_show_hierarchy); |