remove OB_RADIO, added function by mistake
authorCampbell Barton <ideasman42@gmail.com>
Sun, 11 Oct 2009 20:03:55 +0000 (20:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 11 Oct 2009 20:03:55 +0000 (20:03 +0000)
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_object_types.h

index 184b584d18835ad652041dc23bc684260ce7a348..ad51892a94f14d11ce883b185dd456adee971b26 100644 (file)
@@ -4168,9 +4168,6 @@ static void lib_link_scene(FileData *fd, Main *main)
                                /* base->object= newlibadr_us(fd, sce->id.lib, base->object); */
                                base->object= newlibadr_us(fd, sce->id.lib, base->object);
                                
-                               /* when save during radiotool, needs cleared */
-                               base->flag &= ~OB_RADIO;
-                               
                                if(base->object==NULL) {
                                        printf("LIB ERROR: base removed\n");
                                        BLI_remlink(&sce->base, base);
index 8234d0ab6dc871fc2f1efec72878293c5c5f9cce..52744c81b7e2b6315335993a10bf0f010164a49d 100644 (file)
@@ -1796,14 +1796,6 @@ void undo_push_mesh(bContext *C, char *name)
 
 /* *************** END UNDO *************/
 
-void EM_init_viewmats(Object *ob, RegionView3D *rv3d)
-{
-       wmMultMatrix(ob->obmat);
-       /* local viewmat and persmat, to calculate projections */
-       wmGetMatrix(rv3d->viewmatob);
-       wmGetSingleMatrix(rv3d->persmatob);
-}
-
 static EditVert **g_em_vert_array = NULL;
 static EditEdge **g_em_edge_array = NULL;
 static EditFace **g_em_face_array = NULL;
index 3e9b2e5751ba9b65f3583262c7b169d862831124..5a7f82dda136dfd388d6bbfe9c0f6c94b74731d7 100644 (file)
@@ -5567,10 +5567,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
 
        switch( ob->type) {
                case OB_MESH:
-                       if (!(base->flag&OB_RADIO)) {
-                               empty_object= draw_mesh_object(scene, v3d, rv3d, base, dt, flag);
-                               if(flag!=DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE; // mesh draws wire itself
-                       }
+                       empty_object= draw_mesh_object(scene, v3d, rv3d, base, dt, flag);
+                       if(flag!=DRAW_CONSTCOLOR) dtx &= ~OB_DRAWWIRE; // mesh draws wire itself
 
                        break;
                case OB_FONT:
@@ -5913,7 +5911,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
        if(zbufoff) glDisable(GL_DEPTH_TEST);
 
        if(warning_recursive) return;
-       if(base->flag & (OB_FROMDUPLI|OB_RADIO)) return;
+       if(base->flag & OB_FROMDUPLI) return;
        if(G.f & G_RENDER_SHADOW) return;
 
        /* object centers, need to be drawn in viewmat space for speed, but OK for picking select */
index 0940a88267c39d6e426a13ea72122ba7cfcc0e58..73bf698db163e85e533b547d95d9057a4cc4b53e 100644 (file)
@@ -421,7 +421,7 @@ extern Object workob;
 
 #define OB_FROMDUPLI           512
 #define OB_DONE                                1024
-#define OB_RADIO                       2048    /* deprecated */
+// #define OB_RADIO                    2048    /* deprecated */
 #define OB_FROMGROUP           4096
 
 /* ob->recalc (flag bits!) */