Revision: 47664
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47664
Author: campbellbarton
Date: 2012-06-10 10:15:49 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
code cleanup: rename flag --> dflag (draw flag), since this is overly generic
name and was passed about to many functions.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
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
Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2012-06-10 09:44:26 UTC (rev 47663)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c
2012-06-10 10:15:49 UTC (rev 47664)
@@ -557,7 +557,7 @@
/* *************** Armature drawing, bones ******************* */
-static void draw_bone_points(int dt, int armflag, unsigned int boneflag, int
id)
+static void draw_bone_points(const short dt, int armflag, unsigned int
boneflag, int id)
{
/* Draw root point if we are not connected */
if ((boneflag & BONE_CONNECTED) == 0) {
@@ -862,7 +862,7 @@
}
/* does wire only for outline selecting */
-static void draw_sphere_bone(int dt, int armflag, int boneflag, short
constflag, unsigned int id,
+static void draw_sphere_bone(const short dt, int armflag, int boneflag, short
constflag, unsigned int id,
bPoseChannel *pchan, EditBone *ebone)
{
GLUquadricObj *qobj;
@@ -1100,7 +1100,7 @@
glPopMatrix();
}
-static void draw_b_bone_boxes(int dt, bPoseChannel *pchan, float xwidth, float
length, float zwidth)
+static void draw_b_bone_boxes(const short dt, bPoseChannel *pchan, float
xwidth, float length, float zwidth)
{
int segments = 0;
@@ -1128,7 +1128,7 @@
}
}
-static void draw_b_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id,
+static void draw_b_bone(const short dt, int armflag, int boneflag, short
constflag, unsigned int id,
bPoseChannel *pchan, EditBone *ebone)
{
float xwidth, length, zwidth;
@@ -1242,7 +1242,7 @@
}
}
-static void draw_wire_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id,
+static void draw_wire_bone(const short dt, int armflag, int boneflag, short
constflag, unsigned int id,
bPoseChannel *pchan, EditBone *ebone)
{
Mat4 *bbones = NULL;
@@ -1293,7 +1293,7 @@
draw_wire_bone_segments(pchan, bbones, length, segments);
}
-static void draw_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id, float length)
+static void draw_bone(const short dt, int armflag, int boneflag, short
constflag, unsigned int id, float length)
{
/* Draw a 3d octahedral bone, we use normalized space based on length,
@@ -1364,7 +1364,7 @@
}
static void draw_custom_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob,
- int dt, int armflag, int boneflag, unsigned int
id, float length)
+ const short dt, int armflag, int boneflag,
unsigned int id, float length)
{
if (ob == NULL) return;
@@ -1657,7 +1657,7 @@
/* assumes object is Armature with pose */
static void draw_pose_bones(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
- int dt, const unsigned char ob_wire_col[4],
+ const short dt, const unsigned char ob_wire_col[4],
const short do_const_color, const short is_outline)
{
RegionView3D *rv3d = ar->regiondata;
@@ -2082,7 +2082,7 @@
add_v3_v3(bmat[3], eBone->head);
}
-static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, int dt)
+static void draw_ebones(View3D *v3d, ARegion *ar, Object *ob, const short dt)
{
RegionView3D *rv3d = ar->regiondata;
EditBone *eBone;
@@ -2559,7 +2559,7 @@
/* called from drawobject.c, return 1 if nothing was drawn
* (ob_wire_col == NULL) when drawing ghost */
int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base,
- int dt, int flag, const unsigned char ob_wire_col[4],
+ const short dt, const short dflag, const unsigned char
ob_wire_col[4],
const short is_outline)
{
Object *ob = base->object;
@@ -2613,7 +2613,7 @@
if (arm->ghostep)
draw_ghost_poses(scene,
v3d, ar, base);
}
- if ((flag & DRAW_SCENESET) == 0) {
+ if ((dflag & DRAW_SCENESET) == 0) {
if (ob == OBACT)
arm->flag |=
ARM_POSEMODE;
else if (OBACT && (OBACT->mode
& OB_MODE_WEIGHT_PAINT)) {
@@ -2624,7 +2624,7 @@
}
}
}
- draw_pose_bones(scene, v3d, ar, base, dt, ob_wire_col,
(flag & DRAW_CONSTCOLOR), is_outline);
+ draw_pose_bones(scene, v3d, ar, base, dt, ob_wire_col,
(dflag & DRAW_CONSTCOLOR), is_outline);
arm->flag &= ~ARM_POSEMODE;
if (ob->mode & OB_MODE_POSE)
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-06-10 09:44:26 UTC (rev 47663)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c
2012-06-10 10:15:49 UTC (rev 47664)
@@ -333,7 +333,7 @@
/* check for glsl drawing */
-int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt)
+int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, const short dt)
{
if (!GPU_glsl_support())
return 0;
@@ -1190,7 +1190,7 @@
}
static void drawlamp(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base,
- int dt, int flag, const unsigned char ob_wire_col[4])
+ const short 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]);
@@ -1213,7 +1213,7 @@
if (drawcone && !v3d->transp) {
/* in this case we need to draw delayed */
- add_view3d_after(&v3d->afterdraw_transp, base, flag);
+ ED_view3d_after_add(&v3d->afterdraw_transp, base, dflag);
return;
}
@@ -1232,7 +1232,7 @@
/* lamp center */
copy_v3_v3(vec, ob->obmat[3]);
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
/* for AA effects */
curcol[0] = ob_wire_col[0];
curcol[1] = ob_wire_col[1];
@@ -1243,7 +1243,7 @@
if (lampsize > 0.0f) {
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
if (ob->id.us > 1) {
if (ob == OBACT || (ob->flag & SELECT))
glColor4ub(0x88, 0xFF, 0xFF, 155);
else glColor4ub(0x77, 0xCC, 0xCC, 155);
@@ -1257,7 +1257,7 @@
drawcircball(GL_POLYGON, vec, lampsize, imat);
/* restore */
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
if (ob->id.us > 1)
glColor4ubv(curcol);
}
@@ -1492,7 +1492,7 @@
glDisable(GL_BLEND);
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
/* restore for drawing extra stuff */
glColor3ubv(ob_wire_col);
}
@@ -1558,8 +1558,8 @@
}
static void draw_viewport_object_reconstruction(Scene *scene, Base *base,
View3D *v3d,
- MovieClip *clip,
MovieTrackingObject *tracking_object, int flag,
- int *global_track_index, int
draw_selected)
+ MovieClip *clip,
MovieTrackingObject *tracking_object,
+ const short dflag, int
*global_track_index, int draw_selected)
{
MovieTracking *tracking = &clip->tracking;
MovieTrackingTrack *track;
@@ -1602,7 +1602,7 @@
if ((track->flag & TRACK_HAS_BUNDLE) == 0)
continue;
- if (flag & DRAW_PICKING)
+ if (dflag & DRAW_PICKING)
glLoadName(base->selcol + (tracknr << 16));
glPushMatrix();
@@ -1668,7 +1668,7 @@
glPopMatrix();
- if ((flag & DRAW_PICKING) == 0 && (v3d->flag2 &
V3D_SHOW_BUNDLENAME)) {
+ if ((dflag & DRAW_PICKING) == 0 && (v3d->flag2 &
V3D_SHOW_BUNDLENAME)) {
float pos[3];
unsigned char tcol[4];
@@ -1682,7 +1682,7 @@
tracknr++;
}
- if ((flag & DRAW_PICKING) == 0) {
+ if ((dflag & DRAW_PICKING) == 0) {
if ((v3d->flag2 & V3D_SHOW_CAMERAPATH) &&
(tracking_object->flag & TRACKING_OBJECT_CAMERA)) {
MovieTrackingReconstruction *reconstruction;
reconstruction =
BKE_tracking_object_reconstruction(tracking, tracking_object);
@@ -1713,7 +1713,7 @@
}
static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D
*v3d, MovieClip *clip,
- int flag, const unsigned char
ob_wire_col[4],
+ const short dflag, const unsigned
char ob_wire_col[4],
int draw_selected)
{
MovieTracking *tracking = &clip->tracking;
@@ -1734,7 +1734,7 @@
tracking_object = tracking->objects.first;
while (tracking_object) {
draw_viewport_object_reconstruction(scene, base, v3d, clip,
tracking_object,
- flag, &global_track_index,
draw_selected);
+ dflag, &global_track_index,
draw_selected);
tracking_object = tracking_object->next;
}
@@ -1744,17 +1744,17 @@
glDisable(GL_COLOR_MATERIAL);
glDisable(GL_LIGHTING);
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
glColor3ubv(ob_wire_col);
}
- if (flag & DRAW_PICKING)
+ if (dflag & DRAW_PICKING)
glLoadName(base->selcol);
}
/* flag similar to draw_object() */
static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base
*base,
- int flag, const unsigned char ob_wire_col[4])
+ const short dflag, const unsigned char ob_wire_col[4])
{
/* a standing up pyramid with (0,0,0) as top */
Camera *cam;
@@ -1768,13 +1768,13 @@
/* draw data for movie clip set as active for scene */
if (clip) {
- draw_viewport_reconstruction(scene, base, v3d, clip, flag,
ob_wire_col, FALSE);
- draw_viewport_reconstruction(scene, base, v3d, clip, flag,
ob_wire_col, TRUE);
+ draw_viewport_reconstruction(scene, base, v3d, clip, dflag,
ob_wire_col, FALSE);
+ draw_viewport_reconstruction(scene, base, v3d, clip, dflag,
ob_wire_col, TRUE);
}
#ifdef VIEW3D_CAMERA_BORDER_HACK
if (is_view && !(G.f & G_PICKSEL)) {
- if ((flag & DRAW_CONSTCOLOR) == 0) {
+ if ((dflag & DRAW_CONSTCOLOR) == 0) {
view3d_camera_border_hack_col[0] = ob_wire_col[0];
view3d_camera_border_hack_col[1] = ob_wire_col[1];
view3d_camera_border_hack_col[2] = ob_wire_col[2];
@@ -1851,7 +1851,7 @@
glEnd();
}
- if (flag == 0) {
+ if (dflag == 0) {
if (cam->flag & (CAM_SHOWLIMITS + CAM_SHOWMIST)) {
float nobmat[4][4];
World *wrld;
@@ -3146,7 +3146,7 @@
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
