[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15792] branches/soc-2007-joeedh/source/ blender/render/intern/source: remove spurious debug printf

[Joseph Eagar]

Revision: 15792
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15792
Author:   joeedh
Date:     2008-07-27 02:22:23 +0200 (Sun, 27 Jul 2008)

Log Message:
-----------
remove spurious debug printf

Modified Paths:
--------------
    branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c
    branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c  
2008-07-26 23:53:44 UTC (rev 15791)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c  
2008-07-27 00:22:23 UTC (rev 15792)
@@ -503,8 +503,11 @@
                        BLI_addtail(&threadtiles, threadtile);
                }
        }
-
-       /*if (re->r.threads < 2) {
+       
+       /*rendering in the main thread makes status updates not work,
+         but it is desirable for profiling; as such, it will be done
+         if rt is 92.*/
+       if (re->r.threads < 2 && G.rt == 92) {
                thread_data[0].tiles = &threadtiles;
                thread_data[0].threadnr = 0;
                thread_data[0].dbuf = dbuf;
@@ -514,7 +517,7 @@
                MTC_Mat4CpyMat4(thread_data[0].viewinv, re->viewinv);
                thread_data[0].shb = shb;
                do_dsmshadow_thread(thread_data);
-       } else*/ {
+       } else {
                BLI_init_threads(&threads, do_dsmshadow_thread, re->r.threads);
                
                for (x=0; x<re->r.threads; x++) {
@@ -545,7 +548,6 @@
                                }
                        }
 
-                       printf("done: %d, lastdone: %d\n", done, lastdone);
                        if (done != lastdone) {
                                printf("bleh!\n");
                                sprintf(rendertitle, "Shadow tiles %d out of %d 
completed", done, dbuf->tilex*dbuf->tiley);

Modified: branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
===================================================================
--- branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c 
2008-07-26 23:53:44 UTC (rev 15791)
+++ branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c 
2008-07-27 00:22:23 UTC (rev 15792)
@@ -4113,10 +4113,12 @@
                        sseg.sqadaptcos *= sseg.sqadaptcos;
                        sseg.strand= strand;
                        sseg.shadow_mode = 1;
+                       
+                       if (G.rt == 94) {
+                               Mat4CpyMat4(strand->buffer->winmat, re->winmat);
+                               strand->buffer->winx = strand->buffer->winy = 
shb->size;
+                       }
 
-                       //Mat4CpyMat4(strand->buffer->winmat, re->winmat);
-                       //strand->buffer->winx = strand->buffer->winy = 
shb->size;
-
                        // note, these conditions are copied in 
shadowbuf_autoclip()
                        if(sseg.buffer->ma!= ma) {
                                ma= sseg.buffer->ma;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs