Revision: 17434 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17434 Author: blendix Date: 2008-11-12 23:03:11 +0100 (Wed, 12 Nov 2008)
Log Message: ----------- 2.5: merge with trunk, previous merge was only up to yesterday. svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17416:HEAD Modified Paths: -------------- branches/blender2.5/blender/SConstruct branches/blender2.5/blender/config/win32-mingw-config.py branches/blender2.5/blender/config/win32-vc-config.py branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj branches/blender2.5/blender/source/Makefile branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h branches/blender2.5/blender/source/blender/blenkernel/intern/library.c branches/blender2.5/blender/source/blender/blenkernel/intern/material.c branches/blender2.5/blender/source/blender/blenkernel/intern/node.c branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c branches/blender2.5/blender/source/blender/makesdna/DNA_node_types.h branches/blender2.5/blender/source/blender/makesdna/DNA_texture_types.h branches/blender2.5/blender/source/blender/nodes/Makefile branches/blender2.5/blender/source/blender/nodes/SConscript branches/blender2.5/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c branches/blender2.5/blender/source/blender/nodes/intern/SHD_util.c branches/blender2.5/blender/source/blender/render/extern/include/RE_shader_ext.h branches/blender2.5/blender/source/blender/render/intern/include/pixelshading.h branches/blender2.5/blender/source/blender/render/intern/include/texture.h branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c branches/blender2.5/blender/source/blender/render/intern/source/pixelshading.c branches/blender2.5/blender/source/blender/render/intern/source/rayshade.c branches/blender2.5/blender/source/blender/render/intern/source/rendercore.c branches/blender2.5/blender/source/blender/render/intern/source/texture.c branches/blender2.5/blender/tools/Blender.py branches/blender2.5/blender/tools/btools.py Added Paths: ----------- branches/blender2.5/blender/source/blender/nodes/TEX_node.h branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/ branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/Makefile branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.h Removed Paths: ------------- branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/Makefile branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_checker.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_invert.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_output.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_proc.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_texture.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c Modified: branches/blender2.5/blender/SConstruct =================================================================== --- branches/blender2.5/blender/SConstruct 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/SConstruct 2008-11-12 22:03:11 UTC (rev 17434) @@ -516,24 +516,21 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', - '${LCGDIR}/png/lib/libpng.dll', - '#release/windows/extra/zlib.pyd', - '${LCGDIR}/zlib/lib/zlib.dll', - '${LCGDIR}/tiff/lib/libtiff.dll'] + '${BF_PNG_LIBPATH}/libpng.dll', + '${BF_ZLIB_LIBPATH}/zlib.dll', + '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll'] + dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll'] if env['WITH_BF_SDL']: - dllsources.append('${LCGDIR}/sdl/lib/SDL.dll') + dllsources.append('${BF_SDL_LIBPATH}/SDL.dll') if env['WITH_BF_PYTHON']: dllsources.append('#release/windows/extra/python25.zip') + dllsources.append('#release/windows/extra/zlib.pyd') if env['BF_DEBUG']: - dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll') + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll') else: - dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll') - if env['OURPLATFORM'] == 'win32-mingw': - dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll'] - else: - dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll'] + dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}.dll') if env['WITH_BF_ICONV']: - dllsources += ['${LCGDIR}/iconv/lib/iconv.dll'] + dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll'] if env['WITH_BF_FFMPEG']: dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', '${LCGDIR}/ffmpeg/lib/avformat-52.dll', Modified: branches/blender2.5/blender/config/win32-mingw-config.py =================================================================== --- branches/blender2.5/blender/config/win32-mingw-config.py 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/config/win32-mingw-config.py 2008-11-12 22:03:11 UTC (rev 17434) @@ -9,7 +9,7 @@ BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python25' -BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' +BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False @@ -64,6 +64,8 @@ BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' Modified: branches/blender2.5/blender/config/win32-vc-config.py =================================================================== --- branches/blender2.5/blender/config/win32-vc-config.py 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/config/win32-vc-config.py 2008-11-12 22:03:11 UTC (rev 17434) @@ -77,6 +77,8 @@ BF_TIFF = LIBDIR + '/tiff' BF_TIFF_INC = '${BF_TIFF}/include' +BF_TIFF_LIB = 'libtiff' +BF_TIFF_LIBPATH = '${BF_TIFF}/lib' WITH_BF_ZLIB = True BF_ZLIB = LIBDIR + '/zlib' Modified: branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj =================================================================== --- branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/projectfiles_vc9/blender/nodes/nodes.vcproj 2008-11-12 22:03:11 UTC (rev 17434) @@ -316,6 +316,10 @@ RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.c" > </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_util.c" + > + </File> <Filter Name="CMP_nodes" > @@ -600,6 +604,70 @@ > </File> </Filter> + <Filter + Name="TEX_nodes" + > + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_bricks.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_checker.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_curves.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_hueSatVal.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_image.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_invert.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_math.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_mixRgb.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_output.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_proc.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_rotate.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_texture.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_translate.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_valToRgb.c" + > + </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_nodes\TEX_viewer.c" + > + </File> + </Filter> </Filter> <Filter Name="Header Files" @@ -614,6 +682,10 @@ RelativePath="..\..\..\source\blender\nodes\SHD_node.h" > </File> + <File + RelativePath="..\..\..\source\blender\nodes\TEX_node.h" + > + </File> <Filter Name="intern" > @@ -629,6 +701,10 @@ RelativePath="..\..\..\source\blender\nodes\intern\SHD_util.h" > </File> + <File + RelativePath="..\..\..\source\blender\nodes\intern\TEX_util.h" + > + </File> </Filter> </Filter> </Files> Modified: branches/blender2.5/blender/source/Makefile =================================================================== --- branches/blender2.5/blender/source/Makefile 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/source/Makefile 2008-11-12 22:03:11 UTC (rev 17434) @@ -96,6 +96,7 @@ COMLIB += $(OCGDIR)/blender/blenpluginapi/$(DEBUG_DIR)libblenpluginapi.a COMLIB += $(OCGDIR)/blender/nodes_shd/$(DEBUG_DIR)libnodes_shd.a COMLIB += $(OCGDIR)/blender/nodes_cmp/$(DEBUG_DIR)libnodes_cmp.a +COMLIB += $(OCGDIR)/blender/nodes_tex/$(DEBUG_DIR)libnodes_tex.a COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h =================================================================== --- branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h 2008-11-12 22:03:11 UTC (rev 17434) @@ -47,6 +47,7 @@ struct ListBase; struct RenderData; struct Scene; +struct Tex; struct GPUMaterial; struct GPUNode; struct GPUNodeStack; @@ -118,6 +119,8 @@ #define NODE_CLASS_MATTE 9 #define NODE_CLASS_DISTORT 10 #define NODE_CLASS_OP_DYNAMIC 11 +#define NODE_CLASS_PATTERN 12 +#define NODE_CLASS_TEXTURE 13 /* ************** GENERIC API, TREES *************** */ @@ -377,6 +380,45 @@ void free_compbuf(struct CompBuf *cbuf); /* internal...*/ + +/* ************** TEXTURE NODES *************** */ + +struct TexResult; + +#define TEX_NODE_OUTPUT 101 +#define TEX_NODE_CHECKER 102 +#define TEX_NODE_TEXTURE 103 +#define TEX_NODE_BRICKS 104 +#define TEX_NODE_MATH 105 +#define TEX_NODE_MIX_RGB 106 +#define TEX_NODE_RGBTOBW 107 +#define TEX_NODE_VALTORGB 108 +#define TEX_NODE_IMAGE 109 +#define TEX_NODE_CURVE_RGB 110 +#define TEX_NODE_INVERT 111 +#define TEX_NODE_HUE_SAT 112 +#define TEX_NODE_CURVE_TIME 113 +#define TEX_NODE_ROTATE 114 +#define TEX_NODE_VIEWER 115 +#define TEX_NODE_TRANSLATE 116 + +/* 201-299 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */ +#define TEX_NODE_PROC 200 +#define TEX_NODE_PROC_MAX 300 + +extern struct ListBase node_all_textures; + +/* API */ +int ntreeTexTagAnimated(struct bNodeTree *ntree); +void ntreeTexUpdatePreviews( struct bNodeTree* nodetree ); +void ntreeTexExecTree(struct bNodeTree *ntree, struct TexResult *target, float *coord, char do_preview, short thread, struct Tex *tex, short which_output); +void ntreeTexCheckCyclics(struct bNodeTree *ntree); +void ntreeTexAssignIndex(struct bNodeTree *ntree, struct bNode *node); +char* ntreeTexOutputMenu(struct bNodeTree *ntree); + + +/**/ + void init_nodesystem(void); void free_nodesystem(void); Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/library.c =================================================================== --- branches/blender2.5/blender/source/blender/blenkernel/intern/library.c 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/library.c 2008-11-12 22:03:11 UTC (rev 17434) @@ -613,6 +613,8 @@ if(GS(id->name)==ID_MA) isnode= ((Material *)id)->use_nodes; + if(GS(id->name)==ID_TE) + isnode= ((Tex *)id)->use_nodes; if (id->us<0) sprintf(buf, "-1W "); Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/material.c =================================================================== --- branches/blender2.5/blender/source/blender/blenkernel/intern/material.c 2008-11-12 21:16:53 UTC (rev 17433) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/material.c 2008-11-12 22:03:11 UTC (rev 17434) @@ -649,7 +649,7 @@ if(ma->septex & (1<<a)) continue; mtex= ma->mtex[a]; - if(mtex && mtex->tex && mtex->tex->type) { + if(mtex && mtex->tex && (mtex->tex->type | (mtex->tex->use_nodes && mtex->tex->nodetree) )) { ma->texco |= mtex->texco; ma->mapto |= mtex->mapto; Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/node.c =================================================================== --- branches/blender2.5/blender/source/blender/blenkernel/intern/node.c 2008-11-12 21:16:53 UTC (rev 17433) @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs