[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29318] trunk/blender/source/blender/ modifiers/intern: Reverting commit 21540, incorrect bugfix.

[Nicholas Bishop]

Revision: 29318
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29318
Author:   nicholasbishop
Date:     2010-06-07 21:16:56 +0200 (Mon, 07 Jun 2010)

Log Message:
-----------
Reverting commit 21540, incorrect bugfix.

Modified Paths:
--------------
    trunk/blender/source/blender/modifiers/intern/MOD_array.c
    trunk/blender/source/blender/modifiers/intern/MOD_boolean.c

Modified: trunk/blender/source/blender/modifiers/intern/MOD_array.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_array.c	2010-06-07 18:57:04 UTC (rev 29317)
+++ trunk/blender/source/blender/modifiers/intern/MOD_array.c	2010-06-07 19:16:56 UTC (rev 29318)
@@ -211,9 +211,9 @@
 
 	/* need to avoid infinite recursion here */
 	if(amd->start_cap && amd->start_cap != ob)
-		start_cap = mesh_get_derived_final(scene, amd->start_cap, 0);
+		start_cap = amd->start_cap->derivedFinal;
 	if(amd->end_cap && amd->end_cap != ob)
-		end_cap = mesh_get_derived_final(scene, amd->end_cap, 0);
+		end_cap = amd->end_cap->derivedFinal;
 
 	unit_m4(offset);
 

Modified: trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_boolean.c	2010-06-07 18:57:04 UTC (rev 29317)
+++ trunk/blender/source/blender/modifiers/intern/MOD_boolean.c	2010-06-07 19:16:56 UTC (rev 29318)
@@ -85,7 +85,7 @@
   int useRenderParams, int isFinalCalc)
 {
 	BooleanModifierData *bmd = (BooleanModifierData*) md;
-	DerivedMesh *dm = mesh_get_derived_final(md->scene, bmd->object, 0);
+	DerivedMesh *dm = bmd->object->derivedFinal;
 
 	/* we do a quick sanity check */
 	if(dm && (derivedData->getNumFaces(derivedData) > 3)