[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41645] trunk/blender/source/blender: use some more logical BLI math functions & tracking used INT_MAX on a short .

Campbell Barton ideasman42 at gmail.com
Tue Nov 8 10:02:47 CET 2011


Revision: 41645
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41645
Author:   campbellbarton
Date:     2011-11-08 09:02:47 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
use some more logical BLI math functions & tracking used INT_MAX on a short.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/editors/armature/reeb.c
    trunk/blender/source/blender/editors/space_view3d/drawobject.c
    trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c
    trunk/blender/source/blender/render/intern/source/occlusion.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -3176,7 +3176,7 @@
 				mul_v3_fl(v1_tan, 1.0f - 0.01f * frict);
 
 				/* surface_velocity is opposite to cm velocity */
-				mul_v3_v3fl(vr_tan, v1_tan, -1.0f);
+				negate_v3_v3(vr_tan, v1_tan);
 
 				/* get back to global coordinates */
 				add_v3_v3(v1_tan, vc_tan);

Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/editors/armature/reeb.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -3684,7 +3684,7 @@
 		
 		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_INDEX)
 		{
-			interp_v3_v3v3(vec, arc->head->p, arc->tail->p, 0.5f);
+			mid_v3_v3v3(vec, arc->head->p, arc->tail->p);
 			s += sprintf(s, "%i (%i-%i-%i) ", i, arc->symmetry_level, arc->symmetry_flag, arc->symmetry_group);
 		
 			if (G.scene->toolsettings->skgen_options & SKGEN_DISP_WEIGHT)

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -2561,7 +2561,7 @@
 				copy_v3_v3(v1, eed->v1->co);
 				copy_v3_v3(v2, eed->v2->co);
 
-				interp_v3_v3v3(vmid, v1, v2, 0.5f);
+				mid_v3_v3v3(vmid, v1, v2);
 
 				if(do_global) {
 					mul_mat3_m4_v3(ob->obmat, v1);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -781,7 +781,7 @@
 	}
 
 	if(ok) {
-		interp_v3_v3v3(vec, min, max, 0.5);
+		mid_v3_v3v3(vec, min, max);
 	}
 }
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -242,7 +242,7 @@
 	prop= RNA_def_property(srna, "frames_limit", PROP_INT, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "frames_limit");
-	RNA_def_property_range(prop, 0, INT_MAX);
+	RNA_def_property_range(prop, 0, SHRT_MAX);
 	RNA_def_property_ui_text(prop, "Frames Limit", "Amount of frames to be tracked during single tracking operation");
 
 	/* adjust frames */

Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c	2011-11-08 06:30:02 UTC (rev 41644)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c	2011-11-08 09:02:47 UTC (rev 41645)
@@ -321,7 +321,7 @@
 	
 	if(co) {
 		if(vlr->v4)
-			interp_v3_v3v3(co, vlr->v1->co, vlr->v3->co, 0.5f);
+			mid_v3_v3v3(co, vlr->v1->co, vlr->v3->co);
 		else
 			cent_tri_v3(co, vlr->v1->co, vlr->v2->co, vlr->v3->co);
 
@@ -1623,7 +1623,7 @@
 		if(face[3]) {
 			co4= mesh->co[face[3]];
 
-			interp_v3_v3v3(co, co1, co3, 0.5f);
+			mid_v3_v3v3(co, co1, co3);
 			normal_quad_v3( n,co1, co2, co3, co4);
 		}
 		else {




More information about the Bf-blender-cvs mailing list