Revision: 53894
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53894
Author: campbellbarton
Date: 2013-01-18 19:01:26 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
move draw all edges into the object settings (object panel), makes more sense
here since its next to draw extra wire
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesdna/DNA_mesh_types.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-01-18
12:29:18 UTC (rev 53893)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2013-01-18
19:01:26 UTC (rev 53894)
@@ -2382,9 +2382,6 @@
col.prop(view, "show_outline_selected")
col.prop(view, "show_all_objects_origin")
col.prop(view, "show_relationship_lines")
- if ob and ob.type == 'MESH':
- mesh = ob.data
- col.prop(mesh, "show_all_edges")
col = layout.column()
col.active = display_all
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2013-01-18 12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2013-01-18 19:01:26 UTC (rev 53894)
@@ -206,7 +206,7 @@
/* check for glsl drawing */
-int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const short dt)
+int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const char dt)
{
if (!GPU_glsl_support())
return 0;
@@ -1077,7 +1077,7 @@
}
static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
- const short dt, const short dflag, const unsigned char
ob_wire_col[4])
+ const char dt, const short dflag, const unsigned char
ob_wire_col[4])
{
Object *ob = base->object;
const float pixsize = ED_view3d_pixel_size(rv3d, ob->obmat[3]);
@@ -2820,7 +2820,7 @@
}
static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
- Object *ob, BMEditMesh *em, DerivedMesh *cageDM,
DerivedMesh *finalDM, const short dt)
+ Object *ob, BMEditMesh *em, DerivedMesh *cageDM,
DerivedMesh *finalDM, const char dt)
{
Mesh *me = ob->data;
@@ -3026,7 +3026,7 @@
}
static void draw_mesh_fancy(Scene *scene, ARegion *ar, View3D *v3d,
RegionView3D *rv3d, Base *base,
- const short dt, const unsigned char
ob_wire_col[4], const short dflag)
+ const char dt, const unsigned char ob_wire_col[4],
const short dflag)
{
Object *ob = base->object;
Mesh *me = ob->data;
@@ -3235,7 +3235,7 @@
glDepthMask(0); /* disable write in zbuffer, selected
edge wires show better */
}
- dm->drawEdges(dm, (dt == OB_WIRE || totface == 0), me->drawflag
& ME_ALLEDGES);
+ dm->drawEdges(dm, (dt == OB_WIRE || totface == 0), (ob->dtx &
OB_DRAW_ALL_EDGES));
if (dt != OB_WIRE && (draw_wire == OBDRAW_WIRE_ON_DEPTH)) {
glDepthMask(1);
@@ -3261,7 +3261,7 @@
/* returns 1 if nothing was drawn, for detecting to draw an object center */
static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d,
RegionView3D *rv3d, Base *base,
- const short dt, const unsigned char
ob_wire_col[4], const short dflag)
+ const char dt, const unsigned char ob_wire_col[4],
const short dflag)
{
Object *ob = base->object;
Object *obedit = scene->obedit;
@@ -3583,7 +3583,7 @@
}
/* return 1 when nothing was drawn */
-static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Base *base, const short dt)
+static int drawCurveDerivedMesh(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Base *base, const char dt)
{
Object *ob = base->object;
DerivedMesh *dm = ob->derivedFinal;
@@ -3619,7 +3619,7 @@
* \return 1 when nothing was drawn
*/
static int drawDispList_nobackface(Scene *scene, View3D *v3d, RegionView3D
*rv3d, Base *base,
- const short dt, const short dflag, const
unsigned char ob_wire_col[4])
+ const char dt, const short dflag, const
unsigned char ob_wire_col[4])
{
Object *ob = base->object;
ListBase *lb = NULL;
@@ -3745,7 +3745,7 @@
return FALSE;
}
static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base
*base,
- const short dt, const short dflag, const unsigned char
ob_wire_col[4])
+ const char dt, const short dflag, const unsigned char
ob_wire_col[4])
{
int retval;
@@ -5262,7 +5262,7 @@
}
static void drawnurb(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base
*base, Nurb *nurb,
- const short dt, const short dflag, const unsigned char
ob_wire_col[4])
+ const char dt, const short dflag, const unsigned char
ob_wire_col[4])
{
ToolSettings *ts = scene->toolsettings;
Object *ob = base->object;
@@ -5591,7 +5591,7 @@
}
/* return TRUE if nothing was drawn */
static int drawmball(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
- const short dt, const short dflag, const unsigned char
ob_wire_col[4])
+ const char dt, const short dflag, const unsigned char
ob_wire_col[4])
{
Object *ob = base->object;
MetaBall *mb;
@@ -6240,7 +6240,9 @@
unsigned char _ob_wire_col[4]; /* dont initialize this */
unsigned char *ob_wire_col = NULL; /* dont initialize this, use NULL
crashes as a way to find invalid use */
int i, selstart, selend, empty_object = 0;
- short dt, dtx, zbufoff = 0;
+ short dtx;
+ char dt;
+ short zbufoff = 0;
const short is_obact = (ob == OBACT);
/* only once set now, will be removed too, should become a global
standard */
@@ -6754,7 +6756,7 @@
}
if (ob->gameflag & OB_BOUNDS) {
- if (ob->boundtype != ob->collision_boundtype || (dtx &
OB_BOUNDBOX) == 0) {
+ if (ob->boundtype != ob->collision_boundtype || (dtx &
OB_DRAWBOUNDOX) == 0) {
setlinestyle(2);
draw_bounding_volume(scene, ob,
ob->collision_boundtype);
@@ -6768,7 +6770,7 @@
if (dtx & OB_AXIS) {
drawaxes(1.0f, OB_ARROWS);
}
- if (dtx & OB_BOUNDBOX) {
+ if (dtx & OB_DRAWBOUNDOX) {
draw_bounding_volume(scene, ob, ob->boundtype);
}
if (dtx & OB_TEXSPACE) {
@@ -7251,7 +7253,7 @@
if (dm) dm->release(dm);
}
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, const short dt, int outline)
+void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, const char dt, int outline)
{
if (ob == NULL)
return;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2013-01-18 12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2013-01-18 19:01:26 UTC (rev 53894)
@@ -1927,7 +1927,8 @@
BoundBox bb, *bb_tmp; /* use a copy because draw_object, calls
clear_mesh_caches */
GLuint displist = 0;
short transflag, use_displist = -1; /* -1 is initialize */
- char dt, dtx;
+ char dt;
+ short dtx;
if (base->object->restrictflag & OB_RESTRICT_VIEW) return;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
2013-01-18 12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
2013-01-18 19:01:26 UTC (rev 53894)
@@ -119,8 +119,8 @@
/* drawobject.c */
void draw_object(Scene *scene, struct ARegion *ar, View3D *v3d, Base *base,
const short dflag);
-int draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const
short dt);
-void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d,
struct Object *ob, const short dt, int outline);
+int draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const
char dt);
+void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d,
struct Object *ob, const char dt, int outline);
void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d,
struct Object *ob);
void drawaxes(float size, char drawtype);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2013-01-18 12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2013-01-18 19:01:26 UTC (rev 53894)
@@ -879,7 +879,8 @@
ARegion *ar = vc->ar;
rctf rect;
short code, hits;
- char dt, dtx;
+ char dt;
+ short dtx;
G.f |= G_PICKSEL;
Modified: trunk/blender/source/blender/makesdna/DNA_mesh_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_mesh_types.h 2013-01-18
12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/makesdna/DNA_mesh_types.h 2013-01-18
19:01:26 UTC (rev 53894)
@@ -186,7 +186,7 @@
#define ME_DRAWNORMALS (1 << 2)
#define ME_DRAW_VNORMALS (1 << 3)
-#define ME_ALLEDGES (1 << 4)
+// #define ME_ALLEDGES (1 << 4)
#define ME_HIDDENEDGES (1 << 5)
#define ME_DRAWCREASES (1 << 6)
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2013-01-18
12:29:18 UTC (rev 53893)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2013-01-18
19:01:26 UTC (rev 53894)
@@ -218,10 +218,8 @@
char boundtype; /* bounding box use for drawing */
char collision_boundtype; /* bounding box type used for collision */
- char restrictflag; /* for restricting view, select, render etc.
accessible in outliner */
-
+ short dtx; /* viewport draw extra settings */
char dt; /* viewport draw type */
- char dtx; /* viewport draw extra settings */
char empty_drawtype;
float empty_drawsize;
float dupfacesca; /* dupliface scale */
@@ -241,8 +239,9 @@
struct BulletSoftBody *bsoft; /* settings for game engine bullet soft
body */
+ char restrictflag; /* for restricting view, select, render
etc. accessible in outliner */
+ char recalc; /* dependency flag */
short softflag; /* softbody settings */
- short recalc; /* dependency flag */
float anisotropicFriction[3];
ListBase constraints; /* object constraints */
@@ -406,17 +405,19 @@
#define OB_PAINT 100 /* temporary used in draw code */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
