diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-06 14:15:41 +0400 |
commit | 04b0dcd9e53206d3208c0a846d2e52f262bad985 (patch) | |
tree | 1b21679c6c12019bb3663e0277fe54ce979a2726 /source/blender/nodes | |
parent | eef3b72c0e64c01ef8a8d1a84c42377a1b2973e0 (diff) |
- use list append in more places (preferred method since its faster)
- remove some unused include paths
- remove unused linux path define
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 17 | ||||
-rw-r--r-- | source/blender/nodes/intern/CMP_util.c | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 3fe85e2dbb8..d5e8e37f1fd 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -26,12 +26,17 @@ FILE(GLOB SRC intern/*.c intern/CMP_nodes/*.c intern/SHD_nodes/*.c intern/TEX_nodes/*.c) SET(INC - . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna - ../render/extern/include ../../../intern/decimation/extern ../makesrna - ../imbuf ../avi ../../../intern/elbeem/extern - ../../../intern/iksolver/extern ../blenloader - ../blenkernel ../../../extern/glew/include ../gpu - ${ZLIB_INC} + . + ../blenkernel + ../blenlib + ../blenloader + ../gpu + ../imbuf + ../makesdna + ../makesrna + ../render/extern/include + ../../../intern/guardedalloc + ../../../extern/glew/include ) IF(WIN32) diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c index bcb038bccc3..9edcc8b0eec 100644 --- a/source/blender/nodes/intern/CMP_util.c +++ b/source/blender/nodes/intern/CMP_util.c @@ -62,7 +62,7 @@ CompBuf *dupalloc_compbuf(CompBuf *cbuf) { CompBuf *dupbuf= alloc_compbuf(cbuf->x, cbuf->y, cbuf->type, 1); if(dupbuf) { - memcpy(dupbuf->rect, cbuf->rect, cbuf->type*sizeof(float)*cbuf->x*cbuf->y); + memmove(dupbuf->rect, cbuf->rect, cbuf->type*sizeof(float)*cbuf->x*cbuf->y); dupbuf->xof= cbuf->xof; dupbuf->yof= cbuf->yof; |