Reverted incorrect merge (missing files)
[blender.git] / source / blender / radiosity / intern / source / radfactors.c
index ba4dbf1b79300bcad2a458aad97af379bf7c0aaf..b87473dd8116de567b35ab30375140676e1e7eaf 100644 (file)
@@ -47,8 +47,6 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 
-#include "BIF_screen.h"
-
 #include "radio.h"
 #include "RE_render_ext.h"       /* for `RE_zbufferall_radio and RE_zbufferall_radio */
 
@@ -535,10 +533,10 @@ void progressiverad()
 
                if(shoot->first->f & RAD_TWOSIDED) {
                        VECCOPY(unshot, shoot->unshot);
-                       VecMulf(shoot->norm, -1.0);
+                       VecNegf(shoot->norm);
                        if(makeformfactors(shoot))
                                applyformfactors(shoot);
-                       VecMulf(shoot->norm, -1.0);
+                       VecNegf(shoot->norm);
                        VECCOPY(shoot->unshot, unshot);
                }
        
@@ -546,7 +544,7 @@ void progressiverad()
                        applyformfactors(shoot);
        
                        it++;
-                       set_timecursor(it);
+                       //XXX set_timecursor(it);
                        if( (it & 3)==1 ) {
                                make_node_display();
                                rad_forcedraw();
@@ -556,7 +554,7 @@ void progressiverad()
                
                clear_backface_test();
                
-               if(blender_test_break()) break;
+               //XXX if(blender_test_break()) break;
                if(RG.maxiter && RG.maxiter<=it) break;
 
                shoot=findshootpatch();
@@ -672,7 +670,7 @@ void subdivideshootElements(int it)
                        shoot= findshootpatch();
                        if(shoot==0) break;
                        
-                       set_timecursor(a);
+                       //XXX set_timecursor(a);
                        drawpatch_ext(shoot, 0x88FF00);
                        
                        setnodeflags(shoot->first, RAD_SHOOT, 1);
@@ -722,7 +720,7 @@ void subdivideshootElements(int it)
                        }
                        else a--;
                        
-                       if(blender_test_break()) break;
+                       //XXX if(blender_test_break()) break;
                }
                
                /* test for extreme small color change within a patch with subdivflag */
@@ -791,7 +789,7 @@ void subdivideshootElements(int it)
                }
                makeGlobalElemArray();
 
-               if(contin==0 || blender_test_break()) break;
+               //XXX if(contin==0 || blender_test_break()) break;
        }
        
        make_node_display();
@@ -816,7 +814,7 @@ void subdivideshootPatches(int it)
                        shoot= findshootpatch();
                        if(shoot==0) break;
                        
-                       set_timecursor(a);
+                       //XXX set_timecursor(a);
                        drawpatch_ext(shoot, 0x88FF00);
                        
                        setnodeflags(shoot->first, RAD_SHOOT, 1);
@@ -866,7 +864,7 @@ void subdivideshootPatches(int it)
                                
                                setnodeflags(shoot->first, RAD_SHOOT, 0);
                                
-                               if(blender_test_break()) break;
+                               //XXX if(blender_test_break()) break;
                        }
                        else a--;
                        
@@ -893,7 +891,7 @@ void subdivideshootPatches(int it)
                converttopatches();
                makeGlobalElemArray();
 
-               if(contin==0 || blender_test_break()) break;
+               //XXX if(contin==0 || blender_test_break()) break;
        }
        make_node_display();
 }