diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 01:03:11 +0300 |
| commit | b3c238e8bc4c38a8f2ba483be2d19c76d03d674c (patch) | |
| tree | a86991622fa5582498612cf348d0de58af048a08 /projectfiles_vc9 | |
| parent | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (diff) | |
| parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) | |
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
Diffstat (limited to 'projectfiles_vc9')
| -rw-r--r-- | projectfiles_vc9/blender/nodes/nodes.vcproj | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/projectfiles_vc9/blender/nodes/nodes.vcproj b/projectfiles_vc9/blender/nodes/nodes.vcproj index 90595a41e5a..d32ef98da2f 100644 --- a/projectfiles_vc9/blender/nodes/nodes.vcproj +++ b/projectfiles_vc9/blender/nodes/nodes.vcproj @@ -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>
|