diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-09 23:16:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-09 23:16:32 +0400 |
commit | 65d1e27ff5b5d315a462c27d9e194561b78072ec (patch) | |
tree | 636d9011ad1ff897102d8e4e26d31bd1971830e1 | |
parent | d5984b2d50c25cdc97ebad70f00b37c523cd757e (diff) |
fix for using uninitialized value in gpu_shader_material
-rw-r--r-- | intern/ghost/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_material.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index a012f6af61c..f834b55b387 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -82,8 +82,6 @@ add_library(bli_lib "../../../source/blender/blenlib/intern/BLI_memarena.c" ) -message(STATUS "EEEk ${SRC_NEW}") - find_package(OpenGL REQUIRED) diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c index 4e1b53e2026..f78dd9ec727 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c @@ -226,7 +226,7 @@ static int gpu_shader_material(GPUMaterial *mat, bNode *node, GPUNodeStack *in, 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 |