Changeset 1946

Timestamp:

01/05/07 20:13:15 (18 years ago)

Author:

bittner

Message:

merge at home

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (2 diffs)
• ViewCellsManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 5. I 16:28:44 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: pá 5. I 19:57:11 2007
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -2326 +2326 @@
         ray.mRelativePvsContribution /= (float)viewCells.size();
 #endif
+  
 #if USE_RAY_LENGTH_AS_CONTRIBUTION
         float c = 0.0f;