Revision: 44892
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44892
Author: nicholasbishop
Date: 2012-03-15 04:08:57 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Remove unused parameter from multires_dm_create_from_derived.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_multires.h
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/modifiers/intern/MOD_multires.c
Modified: trunk/blender/source/blender/blenkernel/BKE_multires.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-03-15
03:50:52 UTC (rev 44891)
+++ trunk/blender/source/blender/blenkernel/BKE_multires.h 2012-03-15
04:08:57 UTC (rev 44892)
@@ -57,7 +57,7 @@
void multiresModifier_set_levels_from_disps(struct MultiresModifierData *mmd,
struct Object *ob);
struct DerivedMesh *multires_dm_create_from_derived(struct
MultiresModifierData*,
- int local_mmd, struct DerivedMesh*, struct Object *, int, int);
+ int local_mmd, struct DerivedMesh*, struct Object *, int);
struct MultiresModifierData *find_multires_modifier_before(struct Scene *scene,
struct ModifierData *lastmd);
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-03-15
03:50:52 UTC (rev 44891)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-03-15
04:08:57 UTC (rev 44892)
@@ -658,7 +658,7 @@
mmd.totlvl = totlvl;
mmd.simple = simple;
- return multires_dm_create_from_derived(&mmd, 1, dm, ob, 0, 0);
+ return multires_dm_create_from_derived(&mmd, 1, dm, ob, 0);
}
static DerivedMesh *subsurf_dm_create_local(Object *ob, DerivedMesh *dm, int
lvl, int simple, int optimal, int plain_uv)
@@ -1304,8 +1304,9 @@
}
}
-DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, int
local_mmd, DerivedMesh *dm, Object *ob,
- int useRenderParams,
int UNUSED(isFinalCalc))
+DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd,
+
int local_mmd, DerivedMesh *dm,
+
Object *ob, int useRenderParams)
{
Mesh *me= ob->data;
DerivedMesh *result;
@@ -1970,7 +1971,7 @@
mmd->lvl = mmd->totlvl;
orig = CDDM_from_mesh(me, NULL);
- dm = multires_dm_create_from_derived(mmd, 0, orig, ob, 0, 0);
+ dm = multires_dm_create_from_derived(mmd, 0, orig, ob, 0);
multires_load_old_dm(dm, me, mmd->totlvl+1);
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2012-03-15
03:50:52 UTC (rev 44891)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2012-03-15
04:08:57 UTC (rev 44892)
@@ -1001,7 +1001,7 @@
tmp_mmd.lvl= *lvl;
tmp_mmd.sculptlvl= *lvl;
- dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0,
0);
+ dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0);
cddm->release(cddm);
}
@@ -1021,7 +1021,7 @@
tmp_mmd.lvl= mmd->totlvl;
tmp_mmd.sculptlvl= mmd->totlvl;
- dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0, 0);
+ dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0);
cddm->release(cddm);
return dm;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_multires.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_multires.c
2012-03-15 03:50:52 UTC (rev 44891)
+++ trunk/blender/source/blender/modifiers/intern/MOD_multires.c
2012-03-15 04:08:57 UTC (rev 44892)
@@ -84,7 +84,7 @@
}
}
- result = multires_dm_create_from_derived(mmd, 0, dm, ob,
useRenderParams, isFinalCalc);
+ result = multires_dm_create_from_derived(mmd, 0, dm, ob,
useRenderParams);
if(result == dm)
return dm;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
