Revision: 38268
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38268
Author: campbellbarton
Date: 2011-07-09 19:16:32 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
fix for using uninitialized value in gpu_shader_material
Modified Paths:
--------------
trunk/blender/intern/ghost/test/CMakeLists.txt
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
Modified: trunk/blender/intern/ghost/test/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/test/CMakeLists.txt 2011-07-09 17:51:59 UTC
(rev 38267)
+++ trunk/blender/intern/ghost/test/CMakeLists.txt 2011-07-09 19:16:32 UTC
(rev 38268)
@@ -82,9 +82,7 @@
"../../../source/blender/blenlib/intern/BLI_memarena.c"
)
-message(STATUS "EEEk ${SRC_NEW}")
-
find_package(OpenGL REQUIRED)
find_package(Freetype REQUIRED)
Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
2011-07-09 17:51:59 UTC (rev 38267)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
2011-07-09 19:16:32 UTC (rev 38268)
@@ -226,7 +226,7 @@
GPUShadeInput shi;
GPUShadeResult shr;
bNodeSocket *sock;
- char hasinput[NUM_MAT_IN];
+ char hasinput[NUM_MAT_IN]= {'\0'};
int i;
/* note: cannot use the in[]->hasinput flags directly, as these
are not necessarily
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
