[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36614] branches/particles-2010/source/ blender/nodes: Moved tree type directories down one level, out of the intern folder.

Lukas Toenne lukas.toenne at googlemail.com
Wed May 11 15:50:33 CEST 2011


Revision: 36614
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36614
Author:   lukastoenne
Date:     2011-05-11 13:50:33 +0000 (Wed, 11 May 2011)
Log Message:
-----------
Moved tree type directories down one level, out of the intern folder.
Fixed scons build files.

Modified Paths:
--------------
    branches/particles-2010/source/blender/nodes/CMakeLists.txt
    branches/particles-2010/source/blender/nodes/SConscript
    branches/particles-2010/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/particles-2010/source/blender/nodes/shader/nodes/node_shader_common.c
    branches/particles-2010/source/blender/nodes/texture/nodes/node_texture_common.c

Added Paths:
-----------
    branches/particles-2010/source/blender/nodes/composite/
    branches/particles-2010/source/blender/nodes/shader/
    branches/particles-2010/source/blender/nodes/texture/

Removed Paths:
-------------
    branches/particles-2010/source/blender/nodes/intern/composite/
    branches/particles-2010/source/blender/nodes/intern/shader/
    branches/particles-2010/source/blender/nodes/intern/texture/

Modified: branches/particles-2010/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/blender/nodes/CMakeLists.txt	2011-05-11 12:33:34 UTC (rev 36613)
+++ branches/particles-2010/source/blender/nodes/CMakeLists.txt	2011-05-11 13:50:33 UTC (rev 36614)
@@ -34,130 +34,130 @@
 	../makesrna
 	../render/extern/include
 	../../../intern/guardedalloc
-	intern/composite
-	intern/shader
-	intern/texture
 	${GLEW_INCLUDE_PATH}
 	intern
+	composite
+	shader
+	texture
 )
 
 set(SRC
-	intern/composite/nodes/node_composite_alphaOver.c
-	intern/composite/nodes/node_composite_bilateralblur.c
-	intern/composite/nodes/node_composite_blur.c
-	intern/composite/nodes/node_composite_brightness.c
-	intern/composite/nodes/node_composite_channelMatte.c
-	intern/composite/nodes/node_composite_chromaMatte.c
-	intern/composite/nodes/node_composite_colorMatte.c
-	intern/composite/nodes/node_composite_colorSpill.c
-	intern/composite/nodes/node_composite_colorbalance.c
-	intern/composite/nodes/node_composite_common.c
-	intern/composite/nodes/node_composite_composite.c
-	intern/composite/nodes/node_composite_crop.c
-	intern/composite/nodes/node_composite_curves.c
-	intern/composite/nodes/node_composite_defocus.c
-	intern/composite/nodes/node_composite_diffMatte.c
-	intern/composite/nodes/node_composite_dilate.c
-	intern/composite/nodes/node_composite_directionalblur.c
-	intern/composite/nodes/node_composite_displace.c
-	intern/composite/nodes/node_composite_distanceMatte.c
-	intern/composite/nodes/node_composite_filter.c
-	intern/composite/nodes/node_composite_flip.c
-	intern/composite/nodes/node_composite_gamma.c
-	intern/composite/nodes/node_composite_glare.c
-	intern/composite/nodes/node_composite_hueSatVal.c
-	intern/composite/nodes/node_composite_huecorrect.c
-	intern/composite/nodes/node_composite_idMask.c
-	intern/composite/nodes/node_composite_image.c
-	intern/composite/nodes/node_composite_invert.c
-	intern/composite/nodes/node_composite_lensdist.c
-	intern/composite/nodes/node_composite_levels.c
-	intern/composite/nodes/node_composite_lummaMatte.c
-	intern/composite/nodes/node_composite_mapUV.c
-	intern/composite/nodes/node_composite_mapValue.c
-	intern/composite/nodes/node_composite_math.c
-	intern/composite/nodes/node_composite_mixrgb.c
-	intern/composite/nodes/node_composite_normal.c
-	intern/composite/nodes/node_composite_normalize.c
-	intern/composite/nodes/node_composite_outputFile.c
-	intern/composite/nodes/node_composite_premulkey.c
-	intern/composite/nodes/node_composite_rgb.c
-	intern/composite/nodes/node_composite_rotate.c
-	intern/composite/nodes/node_composite_scale.c
-	intern/composite/nodes/node_composite_sepcombHSVA.c
-	intern/composite/nodes/node_composite_sepcombRGBA.c
-	intern/composite/nodes/node_composite_sepcombYCCA.c
-	intern/composite/nodes/node_composite_sepcombYUVA.c
-	intern/composite/nodes/node_composite_setalpha.c
-	intern/composite/nodes/node_composite_splitViewer.c
-	intern/composite/nodes/node_composite_texture.c
-	intern/composite/nodes/node_composite_tonemap.c
-	intern/composite/nodes/node_composite_translate.c
-	intern/composite/nodes/node_composite_valToRgb.c
-	intern/composite/nodes/node_composite_value.c
-	intern/composite/nodes/node_composite_vecBlur.c
-	intern/composite/nodes/node_composite_viewer.c
-	intern/composite/nodes/node_composite_zcombine.c
-	intern/composite/node_composite_tree.c
-	intern/composite/node_composite_util.c
+	composite/nodes/node_composite_alphaOver.c
+	composite/nodes/node_composite_bilateralblur.c
+	composite/nodes/node_composite_blur.c
+	composite/nodes/node_composite_brightness.c
+	composite/nodes/node_composite_channelMatte.c
+	composite/nodes/node_composite_chromaMatte.c
+	composite/nodes/node_composite_colorMatte.c
+	composite/nodes/node_composite_colorSpill.c
+	composite/nodes/node_composite_colorbalance.c
+	composite/nodes/node_composite_common.c
+	composite/nodes/node_composite_composite.c
+	composite/nodes/node_composite_crop.c
+	composite/nodes/node_composite_curves.c
+	composite/nodes/node_composite_defocus.c
+	composite/nodes/node_composite_diffMatte.c
+	composite/nodes/node_composite_dilate.c
+	composite/nodes/node_composite_directionalblur.c
+	composite/nodes/node_composite_displace.c
+	composite/nodes/node_composite_distanceMatte.c
+	composite/nodes/node_composite_filter.c
+	composite/nodes/node_composite_flip.c
+	composite/nodes/node_composite_gamma.c
+	composite/nodes/node_composite_glare.c
+	composite/nodes/node_composite_hueSatVal.c
+	composite/nodes/node_composite_huecorrect.c
+	composite/nodes/node_composite_idMask.c
+	composite/nodes/node_composite_image.c
+	composite/nodes/node_composite_invert.c
+	composite/nodes/node_composite_lensdist.c
+	composite/nodes/node_composite_levels.c
+	composite/nodes/node_composite_lummaMatte.c
+	composite/nodes/node_composite_mapUV.c
+	composite/nodes/node_composite_mapValue.c
+	composite/nodes/node_composite_math.c
+	composite/nodes/node_composite_mixrgb.c
+	composite/nodes/node_composite_normal.c
+	composite/nodes/node_composite_normalize.c
+	composite/nodes/node_composite_outputFile.c
+	composite/nodes/node_composite_premulkey.c
+	composite/nodes/node_composite_rgb.c
+	composite/nodes/node_composite_rotate.c
+	composite/nodes/node_composite_scale.c
+	composite/nodes/node_composite_sepcombHSVA.c
+	composite/nodes/node_composite_sepcombRGBA.c
+	composite/nodes/node_composite_sepcombYCCA.c
+	composite/nodes/node_composite_sepcombYUVA.c
+	composite/nodes/node_composite_setalpha.c
+	composite/nodes/node_composite_splitViewer.c
+	composite/nodes/node_composite_texture.c
+	composite/nodes/node_composite_tonemap.c
+	composite/nodes/node_composite_translate.c
+	composite/nodes/node_composite_valToRgb.c
+	composite/nodes/node_composite_value.c
+	composite/nodes/node_composite_vecBlur.c
+	composite/nodes/node_composite_viewer.c
+	composite/nodes/node_composite_zcombine.c
+	composite/node_composite_tree.c
+	composite/node_composite_util.c
 
-	intern/shader/nodes/node_shader_camera.c
-	intern/shader/nodes/node_shader_common.c
-	intern/shader/nodes/node_shader_curves.c
-	intern/shader/nodes/node_shader_dynamic.c
-	intern/shader/nodes/node_shader_geom.c
-	intern/shader/nodes/node_shader_hueSatVal.c
-	intern/shader/nodes/node_shader_invert.c
-	intern/shader/nodes/node_shader_mapping.c
-	intern/shader/nodes/node_shader_material.c
-	intern/shader/nodes/node_shader_math.c
-	intern/shader/nodes/node_shader_mixRgb.c
-	intern/shader/nodes/node_shader_normal.c
-	intern/shader/nodes/node_shader_output.c
-	intern/shader/nodes/node_shader_rgb.c
-	intern/shader/nodes/node_shader_sepcombRGB.c
-	intern/shader/nodes/node_shader_squeeze.c
-	intern/shader/nodes/node_shader_texture.c
-	intern/shader/nodes/node_shader_valToRgb.c
-	intern/shader/nodes/node_shader_value.c
-	intern/shader/nodes/node_shader_vectMath.c
-	intern/shader/node_shader_tree.c
-	intern/shader/node_shader_util.c
+	shader/nodes/node_shader_camera.c
+	shader/nodes/node_shader_common.c
+	shader/nodes/node_shader_curves.c
+	shader/nodes/node_shader_dynamic.c
+	shader/nodes/node_shader_geom.c
+	shader/nodes/node_shader_hueSatVal.c
+	shader/nodes/node_shader_invert.c
+	shader/nodes/node_shader_mapping.c
+	shader/nodes/node_shader_material.c
+	shader/nodes/node_shader_math.c
+	shader/nodes/node_shader_mixRgb.c
+	shader/nodes/node_shader_normal.c
+	shader/nodes/node_shader_output.c
+	shader/nodes/node_shader_rgb.c
+	shader/nodes/node_shader_sepcombRGB.c
+	shader/nodes/node_shader_squeeze.c
+	shader/nodes/node_shader_texture.c
+	shader/nodes/node_shader_valToRgb.c
+	shader/nodes/node_shader_value.c
+	shader/nodes/node_shader_vectMath.c
+	shader/node_shader_tree.c
+	shader/node_shader_util.c
 
-	intern/texture/nodes/node_texture_at.c
-	intern/texture/nodes/node_texture_bricks.c
-	intern/texture/nodes/node_texture_checker.c
-	intern/texture/nodes/node_texture_common.c
-	intern/texture/nodes/node_texture_compose.c
-	intern/texture/nodes/node_texture_coord.c
-	intern/texture/nodes/node_texture_curves.c
-	intern/texture/nodes/node_texture_decompose.c
-	intern/texture/nodes/node_texture_distance.c
-	intern/texture/nodes/node_texture_hueSatVal.c
-	intern/texture/nodes/node_texture_image.c
-	intern/texture/nodes/node_texture_invert.c
-	intern/texture/nodes/node_texture_math.c
-	intern/texture/nodes/node_texture_mixRgb.c
-	intern/texture/nodes/node_texture_output.c
-	intern/texture/nodes/node_texture_proc.c
-	intern/texture/nodes/node_texture_rotate.c
-	intern/texture/nodes/node_texture_scale.c
-	intern/texture/nodes/node_texture_texture.c
-	intern/texture/nodes/node_texture_translate.c
-	intern/texture/nodes/node_texture_valToNor.c
-	intern/texture/nodes/node_texture_valToRgb.c
-	intern/texture/nodes/node_texture_viewer.c
-	intern/texture/node_texture_tree.c
-	intern/texture/node_texture_util.c
+	texture/nodes/node_texture_at.c
+	texture/nodes/node_texture_bricks.c
+	texture/nodes/node_texture_checker.c
+	texture/nodes/node_texture_common.c
+	texture/nodes/node_texture_compose.c
+	texture/nodes/node_texture_coord.c
+	texture/nodes/node_texture_curves.c
+	texture/nodes/node_texture_decompose.c
+	texture/nodes/node_texture_distance.c
+	texture/nodes/node_texture_hueSatVal.c
+	texture/nodes/node_texture_image.c
+	texture/nodes/node_texture_invert.c
+	texture/nodes/node_texture_math.c
+	texture/nodes/node_texture_mixRgb.c
+	texture/nodes/node_texture_output.c
+	texture/nodes/node_texture_proc.c
+	texture/nodes/node_texture_rotate.c
+	texture/nodes/node_texture_scale.c
+	texture/nodes/node_texture_texture.c
+	texture/nodes/node_texture_translate.c
+	texture/nodes/node_texture_valToNor.c
+	texture/nodes/node_texture_valToRgb.c
+	texture/nodes/node_texture_viewer.c
+	texture/node_texture_tree.c
+	texture/node_texture_util.c
 
 	intern/node_util.c
 	intern/node_exec.c
 	intern/node_common.c
 	intern/node_socket.c
 
-	intern/composite/node_composite_util.h
-	intern/shader/node_shader_util.h
-	intern/texture/node_texture_util.h
+	composite/node_composite_util.h
+	shader/node_shader_util.h
+	texture/node_texture_util.h
 
 	NOD_composite.h
 	NOD_shader.h
@@ -168,10 +168,6 @@
 	intern/node_common.h
 )
 
-add_subdirectory(intern/composite)
-add_subdirectory(intern/shader)
-add_subdirectory(intern/texture)
-
 if(WITH_PYTHON)
 	set(INC ${INC} ../python ${PYTHON_INCLUDE_DIRS})
 	add_definitions(-DWITH_PYTHON)

Modified: branches/particles-2010/source/blender/nodes/SConscript

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list