[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38020] branches/cycles: Cycles: fix crash with image texture nodes (on windows).

[Brecht Van Lommel]

Revision: 38020
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38020
Author:   blendix
Date:     2011-07-01 14:57:48 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
Cycles: fix crash with image texture nodes (on windows).

Modified Paths:
--------------
    branches/cycles/intern/cycles/blender/CMakeLists.txt
    branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c
    branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c

Modified: branches/cycles/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-07-01 
14:46:14 UTC (rev 38019)
+++ branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-07-01 
14:57:48 UTC (rev 38020)
@@ -66,9 +66,12 @@
 
 IF(WIN32)
        TARGET_LINK_LIBRARIES(cycles_blender ${PYTHON_LINKFLAGS})
-       TARGET_LINK_LIBRARIES(cycles_blender debug ${PYTHON_LIBRARIES}_d)
-       TARGET_LINK_LIBRARIES(cycles_blender optimized ${PYTHON_LIBRARIES})
 
+       FILE_LIST_SUFFIX(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
+       TARGET_LINK_LIBRARIES_DEBUG(cycles_blender "${PYTHON_LIBRARIES_DEBUG}")
+       TARGET_LINK_LIBRARIES_OPTIMIZED(cycles_blender "${PYTHON_LIBRARIES}")
+       UNSET(PYTHON_LIBRARIES_DEBUG)
+
        SET_TARGET_PROPERTIES(cycles_blender PROPERTIES PREFIX "lib")
        SET_TARGET_PROPERTIES(cycles_blender PROPERTIES SUFFIX ".pyd")
 ENDIF()
@@ -82,8 +85,7 @@
 
 IF(WIN32)
        FILE(GLOB OIIO_DLLS "${CYCLES_OIIO}/bin/*.dll")
-       FILE(GLOB BOOST_DLLS "${CYCLES_BOOST}/lib/*.dll")
-       INSTALL(FILES ${OIIO_DLLS} ${BOOST_DLLS}
+       INSTALL(FILES ${OIIO_DLLS}
                DESTINATION ${CYCLES_INSTALL_PATH}/cycles)
 ENDIF()
 

Modified: 
branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c 
2011-07-01 14:46:14 UTC (rev 38019)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c 
2011-07-01 14:57:48 UTC (rev 38020)
@@ -68,7 +68,7 @@
                if(ibuf) {
                        float u= (atan2f(vec[1], vec[0]) + 
(float)M_PI)/(2*M_PI);
                        float v= atan2f(vec[2], hypotf(vec[0], vec[1]))/M_PI + 
0.5f;
-                       float rgb[3];
+                       float rgb[4];
 
                        ibuf_sample(ibuf, u, v, 0.0f, 0.0f, rgb);
 

Modified: branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c
===================================================================
--- branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c       
2011-07-01 14:46:14 UTC (rev 38019)
+++ branches/cycles/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c       
2011-07-01 14:57:48 UTC (rev 38020)
@@ -66,7 +66,7 @@
                ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
 
                if(ibuf) {
-                       float rgb[3];
+                       float rgb[4];
 
                        ibuf_sample(ibuf, vec[0], vec[1], 0.0f, 0.0f, rgb);
 

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