griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove OB_RADIO, added function by mistake

Browse Source
This commit is contained in:
Campbell Barton
2009-10-11 20:03:55 +00:00
parent dff1738765
commit 84172b31b5
4 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenloader/intern/readfile.c
View 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);

8
source/blender/editors/mesh/editmesh.c
View 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;

8
source/blender/editors/space_view3d/drawobject.c
View 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 */

2
source/blender/makesdna/DNA_object_types.h
View 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!) */