[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10933] branches/2-44-stable/blender/ source/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Thu Jun 14 22:03:14 CEST 2007
Revision: 10933
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10933
Author: bdiego
Date: 2007-06-14 22:03:14 +0200 (Thu, 14 Jun 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 10748:10749
Fix float error in Transform Contraint with planar constraints when the
plane was perpendicular to the viewport.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10749
revision 10750:10751
Coverity bugfix: Dead Code
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10751
revision 10762:10763 (Bugfix #6730)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10763
revision 10763:10764 (Bugfix #6738)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10764
revision 10765:10766 (Bugfix #6739)
Vector blur error in Ztransp: sometimes black lines (on edges) appeared,
which didn't get blurred away.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10766
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10748
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10750
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10762
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10763
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10765
Modified Paths:
--------------
branches/2-44-stable/blender/source/blender/render/intern/source/zbuf.c
branches/2-44-stable/blender/source/blender/src/drawmesh.c
branches/2-44-stable/blender/source/blender/src/editoops.c
branches/2-44-stable/blender/source/blender/src/transform_constraints.c
branches/2-44-stable/blender/source/blender/src/transform_manipulator.c
Modified: branches/2-44-stable/blender/source/blender/render/intern/source/zbuf.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/zbuf.c 2007-06-14 19:29:39 UTC (rev 10932)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/zbuf.c 2007-06-14 20:03:14 UTC (rev 10933)
@@ -2916,6 +2916,31 @@
case SCE_PASS_NORMAL:
col= shr->nor;
break;
+ case SCE_PASS_VECTOR:
+
+ {
+ ShadeResult *shr_t= shr+1;
+ float *fp= shr->winspeed; /* was initialized */
+ int samp;
+
+ /* add minimum speed in pixel */
+ for(samp= 1; samp<R.osa; samp++, shr_t++) {
+
+ if(shr_t->combined[3] > 0.0f) {
+ float *speed= shr_t->winspeed;
+
+ if( (ABS(speed[0]) + ABS(speed[1]))< (ABS(fp[0]) + ABS(fp[1])) ) {
+ fp[0]= speed[0];
+ fp[1]= speed[1];
+ }
+ if( (ABS(speed[2]) + ABS(speed[3]))< (ABS(fp[2]) + ABS(fp[3])) ) {
+ fp[2]= speed[2];
+ fp[3]= speed[3];
+ }
+ }
+ }
+ }
+ break;
}
if(col) {
float *fp= col+delta;
@@ -3315,7 +3340,11 @@
/* for each mask-sample we alpha-under colors. then in end it's added using filter */
memset(samp_shr, 0, sizeof(ShadeResult)*R.osa);
-
+
+ /* nice this memset, but speed vectors are not initialized OK then. it is sufficient to only clear 1 (see merge_transp_passes) */
+ if(addpassflag & SCE_PASS_VECTOR)
+ samp_shr->winspeed[0]= samp_shr->winspeed[1]= samp_shr->winspeed[2]= samp_shr->winspeed[3]= PASS_VECTOR_MAX;
+
while(totface>0) {
totface--;
Modified: branches/2-44-stable/blender/source/blender/src/drawmesh.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/drawmesh.c 2007-06-14 19:29:39 UTC (rev 10932)
+++ branches/2-44-stable/blender/source/blender/src/drawmesh.c 2007-06-14 20:03:14 UTC (rev 10933)
@@ -1045,7 +1045,7 @@
dm->drawFacesTex(dm, draw_tface__set_draw);
/* drawing game engine text hack */
- if (!editing && prop && me->tface) {
+ if (!editing && prop && me->mtface) {
DerivedMesh *ddm = mesh_get_derived_deform(ob, CD_MASK_BAREMESH);
MFace *mface= me->mface;
MTFace *tface= me->mtface;
Modified: branches/2-44-stable/blender/source/blender/src/editoops.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editoops.c 2007-06-14 19:29:39 UTC (rev 10932)
+++ branches/2-44-stable/blender/source/blender/src/editoops.c 2007-06-14 20:03:14 UTC (rev 10933)
@@ -103,7 +103,7 @@
if(oops->hide==0) {
if(oops->type==ID_OB) {
ob= (Object *)oops->id;
- if ((ob->flag & OB_RESTRICT_VIEW)==0) {
+ if ((ob->restrictflag & OB_RESTRICT_VIEW)==0) {
if(oops->flag & SELECT) ob->flag |= SELECT;
else ob->flag &= ~SELECT;
}
Modified: branches/2-44-stable/blender/source/blender/src/transform_constraints.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/transform_constraints.c 2007-06-14 19:29:39 UTC (rev 10932)
+++ branches/2-44-stable/blender/source/blender/src/transform_constraints.c 2007-06-14 20:03:14 UTC (rev 10933)
@@ -218,7 +218,9 @@
VecSubf(vec, out, in);
factor = Inpf(vec, norm);
- if (factor == 0.0f) return; /* prevent divide by zero */
+ if (fabs(factor) <= FLT_EPSILON) {
+ return; /* prevent divide by zero */
+ }
factor = Inpf(vec, vec) / factor;
VECCOPY(vec, norm);
Modified: branches/2-44-stable/blender/source/blender/src/transform_manipulator.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/transform_manipulator.c 2007-06-14 19:29:39 UTC (rev 10932)
+++ branches/2-44-stable/blender/source/blender/src/transform_manipulator.c 2007-06-14 20:03:14 UTC (rev 10933)
@@ -935,8 +935,6 @@
if(arcs==0 && moving) {
- if(arcs) glEnable(GL_CLIP_PLANE0);
-
/* Z circle */
if(drawflags & MAN_ROT_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
More information about the Bf-blender-cvs
mailing list