diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-13 02:52:20 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-13 02:52:20 +0400 |
commit | dfc9a57b3e2b801a5a4a13b1231f08491dc4e0ab (patch) | |
tree | b6fe865707040b2cf8e066320116647f666b2577 | |
parent | 07ffbbfcb6b4448b147e54eab303a029b10db04e (diff) |
Code cleanup: replace multires update function pointer with direct call.
Renamed the multiresModifier_update() function to
multires_modifier_update_mdisps() and made it visible to subsurf_ccg.c
so it can be called directly. No functional change, just a bit simpler.
-rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index 34123229863..e966991c35a 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -48,6 +48,9 @@ void multires_force_update(struct Object *ob); void multires_force_render_update(struct Object *ob); void multires_force_external_reload(struct Object *ob); +/* internal, only called in subsurf_ccg.c */ +void multires_modifier_update_mdisps(struct DerivedMesh *dm); + void multiresModifier_set_levels_from_disps(struct MultiresModifierData *mmd, struct Object *ob); struct DerivedMesh *multires_dm_create_from_derived(struct MultiresModifierData*, diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index f3cdd858e7d..7f4ff1bf2e3 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -102,8 +102,6 @@ typedef struct CCGDerivedMesh { struct Object *ob; int modified; - - void (*update)(DerivedMesh*); } multires; struct EdgeHash *ehash; diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 06de3cbe5a6..7d50ec6d13a 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -842,7 +842,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm } } -static void multiresModifier_update(DerivedMesh *dm) +void multires_modifier_update_mdisps(struct DerivedMesh *dm) { CCGDerivedMesh *ccgdm= (CCGDerivedMesh*)dm; Object *ob; @@ -1109,7 +1109,6 @@ DerivedMesh *multires_dm_create_from_derived(MultiresModifierData *mmd, int loca ccgdm->multires.lvl = lvl; ccgdm->multires.totlvl = mmd->totlvl; ccgdm->multires.modified = 0; - ccgdm->multires.update = multiresModifier_update; } numGrids = result->getNumGrids(result); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 58b39ea8204..dbce2e144f2 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -55,6 +55,7 @@ #include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_paint.h" #include "BKE_scene.h" #include "BKE_subsurf.h" @@ -2344,7 +2345,7 @@ static void ccgDM_release(DerivedMesh *dm) if(!ccgdm->multires.local_mmd && BLI_findindex(&ccgdm->multires.ob->modifiers, ccgdm->multires.mmd) < 0) ccgdm->multires.mmd = NULL; if(ccgdm->multires.mmd) - ccgdm->multires.update(dm); + multires_modifier_update_mdisps(dm); } if (ccgdm->ehash) |