[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29999] branches/render25/source/blender/ render/intern/source: Render Branch: disable some lowres/ highres raytracing code, isn't working

[Brecht Van Lommel]

Revision: 29999
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29999
Author:   blendix
Date:     2010-07-05 20:45:28 +0200 (Mon, 05 Jul 2010)

Log Message:
-----------
Render Branch: disable some lowres/highres raytracing code, isn't working
well and causing some problems.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/convertblender.c
    branches/render25/source/blender/render/intern/source/rayshade.c

Modified: branches/render25/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/render25/source/blender/render/intern/source/convertblender.c	2010-07-05 18:37:29 UTC (rev 29998)
+++ branches/render25/source/blender/render/intern/source/convertblender.c	2010-07-05 18:45:28 UTC (rev 29999)
@@ -437,8 +437,8 @@
 		}
 
 		/* create low resolution version */
-		if(re->params.r.mode & R_SUBDIVISION)
-			obr->flag |= R_HIGHRES;
+		//if(re->params.r.mode & R_SUBDIVISION)
+		//	obr->flag |= R_HIGHRES;
 	}
 
 	/* and one render object per particle system */

Modified: branches/render25/source/blender/render/intern/source/rayshade.c
===================================================================
--- branches/render25/source/blender/render/intern/source/rayshade.c	2010-07-05 18:37:29 UTC (rev 29998)
+++ branches/render25/source/blender/render/intern/source/rayshade.c	2010-07-05 18:45:28 UTC (rev 29999)
@@ -94,7 +94,7 @@
 	float dist= 1.0f, mindist= FLT_MAX, offset;
 	int a, hit= 0;
 
-	if(!obr || !(obr->flag & R_HIGHRES))
+	//if(!obr || !(obr->flag & R_HIGHRES))
 		return RE_rayobject_raycast(rayob, isec);
 	
 	offset= obr->ob->displacebound;