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.

This commit is contained in:
Campbell Barton 2011-08-11 05:50:05 +00:00
parent e97617e3fb
commit 0fac849d44
4 changed files with 67 additions and 1 deletions

@ -921,7 +921,13 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
case TSE_NLA_ACTION:
UI_icon_draw(x, y, ICON_ACTION); break;
case TSE_DRIVER_BASE:
#if 0 // GSOC_PEPPER
UI_icon_draw(x, y, ICON_DRIVER); break;
#endif // GSOC_PEPPER
case TSE_DEFGROUP_BASE:
UI_icon_draw(x, y, ICON_GROUP_VERTEX); break;
case TSE_BONE:
@ -1080,8 +1086,14 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_FONT); break;
case OB_SURF:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SURFACE); break;
#if 0 // GSOC_PEPPER
case OB_SPEAKER:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_SPEAKER); break;
#endif // GSOC_PEPPER
case OB_EMPTY:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_OB_EMPTY); break;
@ -1125,9 +1137,15 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
tselem_draw_icon_uibut(&arg, ICON_TEXTURE_DATA); break;
case ID_IM:
tselem_draw_icon_uibut(&arg, ICON_IMAGE_DATA); break;
#if 0 // GSOC_PEPPER
case ID_SPK:
case ID_SO:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_SPEAKER); break;
#endif // GSOC_PEPPER
case ID_AR:
tselem_draw_icon_uibut(&arg, ICON_OUTLINER_DATA_ARMATURE); break;
case ID_CA:

@ -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);

@ -135,7 +135,7 @@ static void set_operation_types(SpaceOops *soops, ListBase *lb,
break;
case ID_ME: case ID_CU: case ID_MB: case ID_LT:
case ID_LA: case ID_AR: case ID_CA: case ID_SPK:
case ID_LA: case ID_AR: case ID_CA: /* case ID_SPK: */ /* GSOC_PEPPER */
case ID_MA: case ID_TE: case ID_IP: case ID_IM:
case ID_SO: case ID_KE: case ID_WO: case ID_AC:
case ID_NLA: case ID_TXT: case ID_GR:
@ -152,12 +152,16 @@ static void set_operation_types(SpaceOops *soops, ListBase *lb,
}
}
#if 0 // GSOC_PEPPER
static void unlink_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
{
/* just set action to NULL */
BKE_animdata_set_action(CTX_wm_reports(C), tsep->id, NULL);
}
#endif // GSOC_PEPPER
static void unlink_material_cb(bContext *UNUSED(C), Scene *UNUSED(scene), TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *UNUSED(tselem))
{
Material **matar=NULL;
@ -327,6 +331,8 @@ static void id_fake_user_clear_cb(bContext *UNUSED(C), Scene *UNUSED(scene), Tre
}
}
#if 0 // GSOC_PEPPER
static void singleuser_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te), TreeStoreElem *tsep, TreeStoreElem *tselem)
{
ID *id = tselem->id;
@ -343,6 +349,8 @@ static void singleuser_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement
}
}
#endif
static void group_linkobs2scene_cb(bContext *UNUSED(C), Scene *scene, TreeElement *UNUSED(te), TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
{
Group *group= (Group *)tselem->id;
@ -396,12 +404,16 @@ void outliner_do_object_operation(bContext *C, Scene *scene_act, SpaceOops *soop
/* ******************************************** */
#if 0 // GSOC_PEPPER
static void unlinkact_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te), TreeStoreElem *tselem)
{
/* just set action to NULL */
BKE_animdata_set_action(NULL, tselem->id, NULL);
}
#endif // GSOC_PEPPER
static void cleardrivers_animdata_cb(int UNUSED(event), TreeElement *UNUSED(te), TreeStoreElem *tselem)
{
IdAdtTemplate *iat = (IdAdtTemplate *)tselem->id;
@ -695,12 +707,18 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
{
/* unlink datablock from its parent */
switch (idlevel) {
#if 0 // GSOC_PEPPER
case ID_AC:
outliner_do_libdata_operation(C, scene, soops, &soops->tree, unlink_action_cb);
WM_event_add_notifier(C, NC_ANIMATION|ND_NLA_ACTCHANGE, NULL);
ED_undo_push(C, "Unlink action");
break;
#endif // GSOC_PEPPER
case ID_MA:
outliner_do_libdata_operation(C, scene, soops, &soops->tree, unlink_material_cb);
@ -728,6 +746,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
}
break;
#if 0 // GSOC_PEPPER
case OUTLINER_IDOP_SINGLE:
{
/* make single user */
@ -746,6 +766,8 @@ static int outliner_id_operation_exec(bContext *C, wmOperator *op)
}
break;
#endif // GSOC_PEPPER
case OUTLINER_IDOP_FAKE_ADD:
{
/* set fake user */
@ -822,6 +844,8 @@ static void outliner_do_id_set_operation(SpaceOops *soops, int type, ListBase *l
/* ------------------------------------------ */
#if 0 // GSOC_PEPPER
static void actionset_id_cb(TreeElement *te, TreeStoreElem *tselem, TreeStoreElem *tsep, ID *actId)
{
bAction *act = (bAction *)actId;
@ -906,6 +930,8 @@ void OUTLINER_OT_action_set(wmOperatorType *ot)
ot->prop= prop;
}
#endif // GSOC_PEPPER
/* **************************************** */
typedef enum eOutliner_AnimDataOps {
@ -950,6 +976,9 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
/* perform the core operation */
switch (event) {
#if 0 // GSOC_PEPPER
case OUTLINER_ANIMOP_SET_ACT:
/* delegate once again... */
WM_operator_name_call(C, "OUTLINER_OT_action_set", WM_OP_INVOKE_REGION_WIN, NULL);
@ -963,6 +992,8 @@ static int outliner_animdata_operation_exec(bContext *C, wmOperator *op)
ED_undo_push(C, "Unlink action");
break;
#endif // GSOC_PEPPER
case OUTLINER_ANIMOP_REFRESH_DRV:
outliner_do_data_operation(soops, datalevel, event, &soops->tree, refreshdrivers_animdata_cb);

@ -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;