[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44841] trunk/blender/source/blender/ blenkernel: Code cleanup: replace multires update function pointer with direct call.

[Nicholas Bishop]

Revision: 44841
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44841
Author:   nicholasbishop
Date:     2012-03-12 22:52:20 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_multires.h
    trunk/blender/source/blender/blenkernel/BKE_subsurf.h
    trunk/blender/source/blender/blenkernel/intern/multires.c
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/BKE_multires.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_multires.h	2012-03-12 21:38:13 UTC (rev 44840)
+++ trunk/blender/source/blender/blenkernel/BKE_multires.h	2012-03-12 22:52:20 UTC (rev 44841)
@@ -48,6 +48,9 @@
 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*,

Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h	2012-03-12 21:38:13 UTC (rev 44840)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h	2012-03-12 22:52:20 UTC (rev 44841)
@@ -102,8 +102,6 @@
 
 		struct Object *ob;
 		int modified;
-
-		void (*update)(DerivedMesh*);
 	} multires;
 
 	struct EdgeHash *ehash;

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2012-03-12 21:38:13 UTC (rev 44840)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2012-03-12 22:52:20 UTC (rev 44841)
@@ -842,7 +842,7 @@
 	}
 }
 
-static void multiresModifier_update(DerivedMesh *dm)
+void multires_modifier_update_mdisps(struct DerivedMesh *dm)
 {
 	CCGDerivedMesh *ccgdm= (CCGDerivedMesh*)dm;
 	Object *ob;
@@ -1109,7 +1109,6 @@
 		ccgdm->multires.lvl = lvl;
 		ccgdm->multires.totlvl = mmd->totlvl;
 		ccgdm->multires.modified = 0;
-		ccgdm->multires.update = multiresModifier_update;
 	}
 
 	numGrids = result->getNumGrids(result);

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-12 21:38:13 UTC (rev 44840)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-12 22:52:20 UTC (rev 44841)
@@ -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 @@
 			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)