diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
| commit | 87627374000b7de7445736a7239a3f2b168ce7eb (patch) | |
| tree | 2f0fe5d42d0938fc1b684af702d8613099bea1bd /source/blender/nodes | |
| parent | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (diff) | |
| parent | ba8ea9ec63c25b1ce134a846176f7bf252f4d487 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/nodes/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_filter.c | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 0b2bd9b4bfd..1f76cd0b424 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -55,11 +55,9 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -ADD_DEFINITIONS(-DWITH_CCGSUBSURF) - -BLENDERLIB(bf_nodes "${SRC}" "${INC}") - IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) +BLENDERLIB(bf_nodes "${SRC}" "${INC}") + diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index b1ce78c717e..4859bbb550f 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -39,8 +39,6 @@ if env['WITH_BF_QUICKTIME']: defs += ' WITH_QUICKTIME' incs += ' ' + env['BF_QUICKTIME_INC'] -defs += ' WITH_CCGSUBSURF ' - env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [190] ) env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] ) env.BlenderLib ( libname = 'bf_shdnodes', sources = shdsources, includes = Split(incs), defines = Split(defs), libtype=['core'], priority = [175] ) diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_filter.c b/source/blender/nodes/intern/CMP_nodes/CMP_filter.c index 46a9d747ac1..6011ac3b58a 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_filter.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_filter.c @@ -78,6 +78,7 @@ static void do_filter_edge(CompBuf *out, CompBuf *in, float *filter, float fac) QUATCOPY(fp, row2+4); } else if(pix==CB_VAL) { + fp+= pix; for(x=2; x<rowlen; x++) { f1= filter[0]*row1[0] + filter[1]*row1[1] + filter[2]*row1[2] + filter[3]*row2[0] + filter[4]*row2[1] + filter[5]*row2[2] + filter[6]*row3[0] + filter[7]*row3[1] + filter[8]*row3[2]; f2= filter[0]*row1[0] + filter[3]*row1[1] + filter[6]*row1[2] + filter[1]*row2[0] + filter[4]*row2[1] + filter[7]*row2[2] + filter[2]*row3[0] + filter[5]*row3[1] + filter[8]*row3[2]; |