[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23773] trunk/blender/source/blender: remove OB_RADIO, added function by mistake
Campbell Barton
ideasman42 at gmail.com
Sun Oct 11 22:03:56 CEST 2009
Revision: 23773
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23773
Author: campbellbarton
Date: 2009-10-11 22:03:55 +0200 (Sun, 11 Oct 2009)
Log Message:
-----------
remove OB_RADIO, added function by mistake
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/mesh/editmesh.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_object_types.h
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-11 19:57:56 UTC (rev 23772)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-11 20:03:55 UTC (rev 23773)
@@ -4168,9 +4168,6 @@
/* 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);
Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh.c 2009-10-11 19:57:56 UTC (rev 23772)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c 2009-10-11 20:03:55 UTC (rev 23773)
@@ -1796,14 +1796,6 @@
/* *************** 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;
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2009-10-11 19:57:56 UTC (rev 23772)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2009-10-11 20:03:55 UTC (rev 23773)
@@ -5567,10 +5567,8 @@
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 @@
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 */
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2009-10-11 19:57:56 UTC (rev 23772)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2009-10-11 20:03:55 UTC (rev 23773)
@@ -421,7 +421,7 @@
#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!) */
More information about the Bf-blender-cvs
mailing list