[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51980] trunk/blender/source/blender: code cleanup: use min/max functions rather then macros.
Campbell Barton
ideasman42 at gmail.com
Wed Nov 7 13:31:09 CET 2012
Revision: 51980
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51980
Author: campbellbarton
Date: 2012-11-07 12:31:05 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
code cleanup: use min/max functions rather then macros.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_boid.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_mask.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -467,13 +467,7 @@
mv++;
for (i=1; i<totvert; i++, mv++) {
- min[0]=MIN2(min[0],mv->co[0]);
- min[1]=MIN2(min[1],mv->co[1]);
- min[2]=MIN2(min[2],mv->co[2]);
-
- max[0]=MAX2(max[0],mv->co[0]);
- max[1]=MAX2(max[1],mv->co[1]);
- max[2]=MAX2(max[2],mv->co[2]);
+ minmax_v3v3_v3(min, max, mv->co);
}
sub_v3_v3v3(delta, max, min);
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -1117,7 +1117,7 @@
data[j]->overlap = (BVHTreeOverlap *)malloc(sizeof(BVHTreeOverlap) * max_ii(tree1->totleaf, tree2->totleaf));
data[j]->tree1 = tree1;
data[j]->tree2 = tree2;
- data[j]->max_overlap = MAX2(tree1->totleaf, tree2->totleaf);
+ data[j]->max_overlap = max_ii(tree1->totleaf, tree2->totleaf);
data[j]->i = 0;
data[j]->start_axis = min_axis(tree1->start_axis, tree2->start_axis);
data[j]->stop_axis = min_axis(tree1->stop_axis, tree2->stop_axis);
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -1780,7 +1780,7 @@
if (item->flag) {
/* fixed minimum size items */
- itemw = ui_item_fit(minw, fixedx, fixedw, MIN2(w, fixedw), !item->next, litem->alignment, NULL);
+ itemw = ui_item_fit(minw, fixedx, fixedw, min_ii(w, fixedw), !item->next, litem->alignment, NULL);
fixedx += itemw;
}
else {
@@ -1959,9 +1959,9 @@
ui_item_size(item, &itemw, &itemh);
y -= itemh + style->buttonspacey;
- miny = MIN2(miny, y);
+ miny = min_ii(miny, y);
emy -= itemh;
- maxw = MAX2(itemw, maxw);
+ maxw = max_ii(itemw, maxw);
/* decide to go to next one */
if (col < flow->totcol - 1 && emy <= -emh) {
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -285,8 +285,8 @@
drawmeta_stipple(1);
for (seq = seqm->seqbase.first; seq; seq = seq->next) {
- chan_min = MIN2(chan_min, seq->machine);
- chan_max = MAX2(chan_max, seq->machine);
+ chan_min = min_ii(chan_min, seq->machine);
+ chan_max = max_ii(chan_max, seq->machine);
}
chan_range = (chan_max - chan_min) + 1;
Modified: trunk/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_action.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_action.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -46,9 +46,13 @@
#ifdef RNA_RUNTIME
-#include "ED_keyframing.h"
+#include "BLI_math_base.h"
+
#include "BKE_fcurve.h"
+#include "ED_keyframing.h"
+
+
static void rna_ActionGroup_channels_next(CollectionPropertyIterator *iter)
{
ListBaseIterator *internal = iter->internal;
@@ -191,8 +195,7 @@
bAction *act = (bAction *)ptr->data;
*min = 0;
- *max = BLI_countlist(&act->markers) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&act->markers) - 1);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -54,6 +54,8 @@
#ifdef RNA_RUNTIME
+#include "BLI_math_base.h"
+
#include "BKE_animsys.h"
#include "BKE_fcurve.h"
#include "BKE_nla.h"
@@ -371,8 +373,7 @@
KeyingSet *ks = (KeyingSet *)ptr->data;
*min = 0;
- *max = BLI_countlist(&ks->paths) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&ks->paths) - 1);
}
static PointerRNA rna_KeyingSet_typeinfo_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_boid.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_boid.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_boid.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -80,6 +80,8 @@
#ifdef RNA_RUNTIME
+#include "BLI_math_base.h"
+
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_particle.h"
@@ -157,8 +159,7 @@
{
BoidState *state = (BoidState *)ptr->data;
*min = 0;
- *max = BLI_countlist(&state->rules) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&state->rules) - 1);
}
static int rna_BoidState_active_boid_rule_index_get(PointerRNA *ptr)
@@ -224,8 +225,7 @@
{
BoidSettings *boids = (BoidSettings *)ptr->data;
*min = 0;
- *max = BLI_countlist(&boids->states) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&boids->states) - 1);
}
static int rna_BoidSettings_active_boid_state_index_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -242,16 +242,14 @@
{
Curve *cu = (Curve *)ptr->id.data;
*min = 0;
- *max = cu->totcol - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, cu->totcol - 1);
}
static void rna_Curve_active_textbox_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
{
Curve *cu = (Curve *)ptr->id.data;
*min = 0;
- *max = cu->totbox - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, cu->totbox - 1);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_mask.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_mask.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -158,8 +158,7 @@
Mask *mask = (Mask *)ptr->id.data;
*min = 0;
- *max = mask->masklay_tot - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, mask->masklay_tot - 1);
*softmin = *min;
*softmax = *max;
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -1010,8 +1010,7 @@
{
Mesh *me = rna_mesh(ptr);
*min = 0;
- *max = me->totcol - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, me->totcol - 1);
}
static int rna_MeshVertex_index_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -481,8 +481,7 @@
MultiresModifierData *mmd = (MultiresModifierData *)ptr->data;
*min = 0;
- *max = mmd->totlvl; /* intentionally _not_ -1 */
- *max = MAX2(0, *max);
+ *max = max_ii(0, mmd->totlvl); /* intentionally _not_ -1 */
}
static int rna_MultiresModifier_external_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -547,8 +547,7 @@
Object *ob = (Object *)ptr->id.data;
*min = 0;
- *max = BLI_countlist(&ob->defbase) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&ob->defbase) - 1);
}
void rna_object_vgroup_name_index_get(PointerRNA *ptr, char *value, int index)
@@ -658,7 +657,7 @@
{
Object *ob = (Object *)ptr->id.data;
*min = 0;
- *max = MAX2(ob->totcol - 1, 0);
+ *max = max_ii(ob->totcol - 1, 0);
}
/* returns active base material */
@@ -684,8 +683,7 @@
{
Object *ob = (Object *)ptr->id.data;
*min = 0;
- *max = BLI_countlist(&ob->particlesystem) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(&ob->particlesystem) - 1);
}
static int rna_Object_active_particle_system_index_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_object_force.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object_force.c 2012-11-07 12:24:03 UTC (rev 51979)
+++ trunk/blender/source/blender/makesrna/intern/rna_object_force.c 2012-11-07 12:31:05 UTC (rev 51980)
@@ -51,6 +51,9 @@
#ifdef RNA_RUNTIME
+#include "BLI_math_base.h"
+
+
/* type specific return values only used from functions */
static EnumPropertyItem curve_shape_items[] = {
{PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
@@ -239,8 +242,7 @@
for (pid = pidlist.first; pid; pid = pid->next) {
if (pid->cache == cache) {
- *max = BLI_countlist(pid->ptcaches) - 1;
- *max = MAX2(0, *max);
+ *max = max_ii(0, BLI_countlist(pid->ptcaches) - 1);
break;
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2012-11-07 12:24:03 UTC (rev 51979)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list