Revision: 44861
http://brlcad.svn.sourceforge.net/brlcad/?rev=44861&view=rev
Author: kunigami
Date: 2011-06-09 11:33:30 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
removed unused cpp flags
Modified Paths:
--------------
brlcad/trunk/src/liboptical/CMakeLists.txt
brlcad/trunk/src/liboptical/osl-renderer.cpp
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-09 11:30:12 UTC (rev
44860)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-09 11:33:30 UTC (rev
44861)
@@ -58,7 +58,7 @@
# NOTE(boulos): Boost can only detect that you've disabled RTTI for
# gcc >= 4.3. My poor mac doesn't have that.
- add_definitions("-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -Wno-error
-no-pedantic -DOSL_ENABLED")
+ add_definitions("-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID
-DOSL_ENABLED")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
Modified: brlcad/trunk/src/liboptical/osl-renderer.cpp
===================================================================
--- brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-09 11:30:12 UTC
(rev 44860)
+++ brlcad/trunk/src/liboptical/osl-renderer.cpp 2011-06-09 11:33:30 UTC
(rev 44861)
@@ -28,8 +28,8 @@
thread_info.Xi[0] = 0;
thread_info.Xi[1] = 0;
thread_info.Xi[2] = y*y*y;
-
- // execute shader
+
+ // execute shader
ShaderGlobals globals;
ClosureColor *closure = ExecuteShaders(globals, info);
@@ -96,6 +96,9 @@
VMOVE(globals.P, info->P);
VMOVE(globals.I, info->I);
VMOVE(globals.Ng, info->N);
+
+ memset(&globals, 0, sizeof(globals));
+
globals.N = globals.Ng;
// u-v coordinates
@@ -115,6 +118,8 @@
// execute shader
thread_info.ctx->execute(ShadUseSurface, *shaderstate, globals);
+
+
return globals.Ci;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
