From cbd5b492b1173f7acb3a5b91d5fc395f06bd00de Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 4 Dec 2011 06:39:35 +0000 Subject: [PATCH] remove use of deprecated struct members - editmesh smooth & subdivide were using old mirror axis flag still. - removed colbits from outliner and object code. - commented some other parts of the code which access deprecated members and aren't called anywhere. --- source/blender/blenkernel/BKE_group.h | 2 ++ source/blender/blenkernel/intern/group.c | 4 ++++ source/blender/blenkernel/intern/mesh.c | 4 +--- source/blender/blenkernel/intern/object.c | 1 - source/blender/blenkernel/intern/scene.c | 4 ---- source/blender/blenkernel/intern/text.c | 6 ------ source/blender/editors/gpencil/drawgpencil.c | 4 ++-- source/blender/editors/mesh/editmesh_mods.c | 18 ++++-------------- source/blender/editors/mesh/editmesh_tools.c | 19 +++++-------------- source/blender/editors/mesh/meshtools.c | 1 - .../editors/space_outliner/outliner_select.c | 2 -- .../editors/space_sequencer/space_sequencer.c | 1 - source/blender/modifiers/intern/MOD_mirror.c | 1 - 13 files changed, 18 insertions(+), 49 deletions(-) diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h index 554314c419a..044a40658c3 100644 --- a/source/blender/blenkernel/BKE_group.h +++ b/source/blender/blenkernel/BKE_group.h @@ -52,8 +52,10 @@ int group_is_animated(struct Object *parent, struct Group *group); void group_tag_recalc(struct Group *group); void group_handle_recalc_and_update(struct Scene *scene, struct Object *parent, struct Group *group); +#if 0 /* UNUSED */ struct Object *group_get_member_with_action(struct Group *group, struct bAction *act); void group_relink_nla_objects(struct Object *ob); +#endif #endif diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 76c3e6e5502..d0f09857781 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -123,8 +123,10 @@ void unlink_group(Group *group) for(psys=ob->particlesystem.first; psys; psys=psys->next){ if(psys->part->dup_group==group) psys->part->dup_group= NULL; +#if 0 /* not used anymore, only keps for readfile.c, no need to account for this */ if(psys->part->eff_group==group) psys->part->eff_group= NULL; +#endif } } @@ -381,6 +383,7 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group } } +#if 0 Object *group_get_member_with_action(Group *group, bAction *act) { GroupObject *go; @@ -432,3 +435,4 @@ void group_relink_nla_objects(Object *ob) } } +#endif diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index ab45aeed8c3..736c24e2c06 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -106,9 +106,7 @@ void unlink_mesh(Mesh *me) } if(me->key) { - me->key->id.us--; - if (me->key->id.us == 0 && me->key->ipo ) - me->key->ipo->id.us--; + me->key->id.us--; } me->key= NULL; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index eaa840ad0f9..13b6919683c 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1397,7 +1397,6 @@ void object_make_proxy(Object *ob, Object *target, Object *gob) ob->matbits= NULL; if ((target->totcol) && (target->mat) && OB_TYPE_SUPPORT_MATERIAL(ob->type)) { int i; - ob->colbits = target->colbits; ob->actcol= target->actcol; ob->totcol= target->totcol; diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index c284ed02868..ebe360ef91b 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -394,10 +394,6 @@ Scene *add_scene(const char *name) sce->r.simplify_shadowsamples= 16; sce->r.simplify_aosss= 1.0f; - sce->r.cineonblack= 95; - sce->r.cineonwhite= 685; - sce->r.cineongamma= 1.7f; - sce->r.border.xmin= 0.0f; sce->r.border.ymin= 0.0f; sce->r.border.xmax= 1.0f; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 28d68892a2a..60cc029bf6e 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -479,17 +479,11 @@ void unlink_text(Main *bmain, Text *text) bScreen *scr; ScrArea *area; SpaceLink *sl; - Scene *scene; Object *ob; bController *cont; bConstraint *con; short update; - /* dome */ - for(scene=bmain->scene.first; scene; scene=scene->id.next) - if(scene->r.dometext == text) - scene->r.dometext = NULL; - for(ob=bmain->object.first; ob; ob=ob->id.next) { /* game controllers */ for(cont=ob->controllers.first; cont; cont=cont->next) { diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index d40831f9e87..cf3961e0820 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -703,7 +703,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) dflag |= GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_IEDITHACK; } break; - +#if 0 /* removed since 2.5x, needs to be added back */ case SPACE_SEQ: /* sequence */ { SpaceSeq *sseq= (SpaceSeq *)sa->spacedata.first; @@ -728,7 +728,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf) dflag |= GP_DRAWDATA_ONLYI2D; } break; - +#endif default: /* for spacetype not yet handled */ offsx= 0; offsy= 0; diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index a4d418aee69..b1754fa2f2e 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -4151,20 +4151,10 @@ static int smooth_vertex(bContext *C, wmOperator *op) for (eve= em->verts.first; eve; eve= eve->next) { if(eve->f & SELECT) { - switch(mmd->axis){ - case 0: - if (fabsf(eve->co[0]) < mmd->tolerance) - eve->f2 |= 1; - break; - case 1: - if (fabsf(eve->co[1]) < mmd->tolerance) - eve->f2 |= 2; - break; - case 2: - if (fabsf(eve->co[2]) < mmd->tolerance) - eve->f2 |= 4; - break; - } + if (mmd->flag & MOD_MIR_AXIS_X && fabsf(eve->co[0]) < mmd->tolerance) eve->f2 |= 1; + if (mmd->flag & MOD_MIR_AXIS_Y && fabsf(eve->co[1]) < mmd->tolerance) eve->f2 |= 2; + if (mmd->flag & MOD_MIR_AXIS_Z && fabsf(eve->co[2]) < mmd->tolerance) eve->f2 |= 4; + } } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index acc6ab1fc0e..df81f80ade8 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -2666,20 +2666,11 @@ void esubdivideflag(Object *obedit, EditMesh *em, int flag, float smooth, float if(mmd->flag & MOD_MIR_CLIPPING) { for (eve= em->verts.first; eve; eve= eve->next) { eve->f2= 0; - switch(mmd->axis){ - case 0: - if (fabsf(eve->co[0]) < mmd->tolerance) - eve->f2 |= 1; - break; - case 1: - if (fabsf(eve->co[1]) < mmd->tolerance) - eve->f2 |= 2; - break; - case 2: - if (fabsf(eve->co[2]) < mmd->tolerance) - eve->f2 |= 4; - break; - } + + if (mmd->flag & MOD_MIR_AXIS_X && fabsf(eve->co[0]) < mmd->tolerance) eve->f2 |= 1; + if (mmd->flag & MOD_MIR_AXIS_Y && fabsf(eve->co[1]) < mmd->tolerance) eve->f2 |= 2; + if (mmd->flag & MOD_MIR_AXIS_Z && fabsf(eve->co[2]) < mmd->tolerance) eve->f2 |= 4; + } } } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 3caafb12f82..707936351cf 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -497,7 +497,6 @@ int join_mesh_exec(bContext *C, wmOperator *op) MEM_freeN(matar); ob->totcol= me->totcol= totcol; - ob->colbits= 0; if (matmap) MEM_freeN(matmap); diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 42fe14cd59c..aa50b3d5154 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -237,7 +237,6 @@ static int tree_element_active_material(bContext *C, Scene *scene, SpaceOops *so if(set) { ob->actcol= te->index+1; ob->matbits[te->index]= 1; // make ob material active too - ob->colbits |= (1<index); } else { if(ob->actcol == te->index+1) @@ -249,7 +248,6 @@ static int tree_element_active_material(bContext *C, Scene *scene, SpaceOops *so if(set) { ob->actcol= te->index+1; ob->matbits[te->index]= 0; // make obdata material active too - ob->colbits &= ~(1<index); } else { if(ob->actcol == te->index+1) diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index bf268b0e304..303f6912ff1 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -105,7 +105,6 @@ static SpaceLink *sequencer_new(const bContext *C) sseq= MEM_callocN(sizeof(SpaceSeq), "initsequencer"); sseq->spacetype= SPACE_SEQ; - sseq->zoom= 4; sseq->chanshown = 0; sseq->view = SEQ_VIEW_SEQUENCE; sseq->mainb = SEQ_DRAW_IMG_IMBUF; diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 2e744337b97..5336cb03efa 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -64,7 +64,6 @@ static void copyData(ModifierData *md, ModifierData *target) MirrorModifierData *mmd = (MirrorModifierData*) md; MirrorModifierData *tmmd = (MirrorModifierData*) target; - tmmd->axis = mmd->axis; tmmd->flag = mmd->flag; tmmd->tolerance = mmd->tolerance; tmmd->mirror_ob = mmd->mirror_ob;