Got rid of old multires code, brought in multires modifier from

soc-2008-nicholasbishop branch.

Note: any old code with multires_test() or multires_level1_test() can 
just be deleted, not needed by the multires modifier.

2 files changed, 0 insertions, 11 deletions

diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 1768b052b54..34553208574 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -505,7 +505,6 @@ typedef struct LampRen {
 #define R_LAMPHALO		8
 #define R_GLOB_NOPUNOFLIP	16
 #define R_NEED_TANGENT	32
-#define R_SKIP_MULTIRES	64
 #define R_BAKE_TRACE	128
 #define R_BAKING		256
 
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index b36f4337235..3149b711a27 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -99,7 +99,6 @@
 #include "IMB_imbuf_types.h"
 
 #include "envmap.h"
-//XXX #include "multires.h"
 #include "occlusion.h"
 #include "render_types.h"
 #include "rendercore.h"
@@ -3077,13 +3076,6 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
 		if(need_orco)
 			mask |= CD_MASK_ORCO;
 
-	if(me->mr) {
-		if(re->flag & R_SKIP_MULTIRES)
-			me->mr->flag |= MULTIRES_NO_RENDER;
-		else
-			me->mr->flag &= ~MULTIRES_NO_RENDER;
-	}
-
 	dm= mesh_create_derived_render(re->scene, ob, mask);
 	if(dm==NULL) return;	/* in case duplicated object fails? */
 
@@ -5432,8 +5424,6 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 	re->flag |= R_GLOB_NOPUNOFLIP;
 	re->flag |= R_BAKING;
 	re->excludeob= actob;
-	if(type == RE_BAKE_LIGHT)
-		re->flag |= R_SKIP_MULTIRES;
 	if(actob)
 		re->flag |= R_BAKE_TRACE;