Merged the particles-2010 branch with node improvements into trunk.
authorLukas Toenne <lukas.toenne@googlemail.com>
Mon, 5 Sep 2011 21:01:50 +0000 (21:01 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Mon, 5 Sep 2011 21:01:50 +0000 (21:01 +0000)
commit8e0fe8bff72e2dc2926618577eaffdd3417a8304
tree43b933c88cac451518dc68846c1119acacffca4f
parent6e9ff495eb082aeb49e6a1da23a7827d3fcd0fde
Merged the particles-2010 branch with node improvements into trunk.

This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:

http://wiki.blender.org/index.php/User:Phonybone/Particles2010
166 files changed:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/math_vector.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_node.h
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_buttons.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_ops.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_node/node_state.c
source/blender/editors/space_node/space_node.c
source/blender/editors/transform/transform_conversions.c
source/blender/gpu/SConscript
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/SConscript
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_composite.h [moved from source/blender/nodes/CMP_node.h with 93% similarity]
source/blender/nodes/NOD_shader.h [moved from source/blender/nodes/SHD_node.h with 88% similarity]
source/blender/nodes/NOD_socket.h [new file with mode: 0644]
source/blender/nodes/NOD_texture.h [moved from source/blender/nodes/TEX_node.h with 90% similarity]
source/blender/nodes/SConscript
source/blender/nodes/composite/node_composite_tree.c [new file with mode: 0644]
source/blender/nodes/composite/node_composite_util.c [moved from source/blender/nodes/intern/CMP_util.c with 99% similarity]
source/blender/nodes/composite/node_composite_util.h [moved from source/blender/nodes/intern/CMP_util.h with 97% similarity]
source/blender/nodes/composite/nodes/node_composite_alphaOver.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c with 86% similarity]
source/blender/nodes/composite/nodes/node_composite_bilateralblur.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c with 91% similarity]
source/blender/nodes/composite/nodes/node_composite_blur.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_blur.c with 96% similarity]
source/blender/nodes/composite/nodes/node_composite_brightness.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_brightness.c with 79% similarity]
source/blender/nodes/composite/nodes/node_composite_channelMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c with 89% similarity]
source/blender/nodes/composite/nodes/node_composite_chromaMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c with 88% similarity]
source/blender/nodes/composite/nodes/node_composite_colorMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c with 84% similarity]
source/blender/nodes/composite/nodes/node_composite_colorSpill.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c with 93% similarity]
source/blender/nodes/composite/nodes/node_composite_colorbalance.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c with 91% similarity]
source/blender/nodes/composite/nodes/node_composite_common.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_composite.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_composite.c with 85% similarity]
source/blender/nodes/composite/nodes/node_composite_crop.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_crop.c with 87% similarity]
source/blender/nodes/composite/nodes/node_composite_curves.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_curves.c with 78% similarity]
source/blender/nodes/composite/nodes/node_composite_defocus.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_defocus.c with 97% similarity]
source/blender/nodes/composite/nodes/node_composite_diffMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c with 84% similarity]
source/blender/nodes/composite/nodes/node_composite_dilate.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_dilate.c with 87% similarity]
source/blender/nodes/composite/nodes/node_composite_directionalblur.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c with 88% similarity]
source/blender/nodes/composite/nodes/node_composite_displace.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_displace.c with 88% similarity]
source/blender/nodes/composite/nodes/node_composite_distanceMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c with 83% similarity]
source/blender/nodes/composite/nodes/node_composite_filter.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_filter.c with 92% similarity]
source/blender/nodes/composite/nodes/node_composite_flip.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_flip.c with 85% similarity]
source/blender/nodes/composite/nodes/node_composite_gamma.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_gamma.c with 81% similarity]
source/blender/nodes/composite/nodes/node_composite_glare.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_glare.c with 96% similarity]
source/blender/nodes/composite/nodes/node_composite_hueSatVal.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c with 82% similarity]
source/blender/nodes/composite/nodes/node_composite_huecorrect.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c with 87% similarity]
source/blender/nodes/composite/nodes/node_composite_idMask.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_idMask.c with 84% similarity]
source/blender/nodes/composite/nodes/node_composite_image.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_image.c with 93% similarity]
source/blender/nodes/composite/nodes/node_composite_invert.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_invert.c with 84% similarity]
source/blender/nodes/composite/nodes/node_composite_lensdist.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c with 90% similarity]
source/blender/nodes/composite/nodes/node_composite_levels.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_levels.c with 87% similarity]
source/blender/nodes/composite/nodes/node_composite_lummaMatte.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c with 82% similarity]
source/blender/nodes/composite/nodes/node_composite_mapUV.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c with 90% similarity]
source/blender/nodes/composite/nodes/node_composite_mapValue.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c with 80% similarity]
source/blender/nodes/composite/nodes/node_composite_math.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_math.c with 89% similarity]
source/blender/nodes/composite/nodes/node_composite_mixrgb.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c with 81% similarity]
source/blender/nodes/composite/nodes/node_composite_normal.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_normal.c with 72% similarity]
source/blender/nodes/composite/nodes/node_composite_normalize.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_normalize.c with 86% similarity]
source/blender/nodes/composite/nodes/node_composite_outputFile.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c with 85% similarity]
source/blender/nodes/composite/nodes/node_composite_premulkey.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_premulkey.c with 79% similarity]
source/blender/nodes/composite/nodes/node_composite_rgb.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_rgb.c with 64% similarity]
source/blender/nodes/composite/nodes/node_composite_rotate.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_rotate.c with 83% similarity]
source/blender/nodes/composite/nodes/node_composite_scale.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_scale.c with 84% similarity]
source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c with 80% similarity]
source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c with 78% similarity]
source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c with 87% similarity]
source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c with 80% similarity]
source/blender/nodes/composite/nodes/node_composite_setalpha.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c with 81% similarity]
source/blender/nodes/composite/nodes/node_composite_splitViewer.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c with 88% similarity]
source/blender/nodes/composite/nodes/node_composite_texture.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_texture.c with 90% similarity]
source/blender/nodes/composite/nodes/node_composite_tonemap.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c with 91% similarity]
source/blender/nodes/composite/nodes/node_composite_translate.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_translate.c with 73% similarity]
source/blender/nodes/composite/nodes/node_composite_valToRgb.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c with 80% similarity]
source/blender/nodes/composite/nodes/node_composite_value.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_value.c with 65% similarity]
source/blender/nodes/composite/nodes/node_composite_vecBlur.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c with 81% similarity]
source/blender/nodes/composite/nodes/node_composite_viewer.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_viewer.c with 86% similarity]
source/blender/nodes/composite/nodes/node_composite_zcombine.c [moved from source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c with 89% similarity]
source/blender/nodes/intern/SHD_util.c [deleted file]
source/blender/nodes/intern/node_common.c [new file with mode: 0644]
source/blender/nodes/intern/node_common.h [new file with mode: 0644]
source/blender/nodes/intern/node_exec.c [new file with mode: 0644]
source/blender/nodes/intern/node_exec.h [new file with mode: 0644]
source/blender/nodes/intern/node_socket.c [new file with mode: 0644]
source/blender/nodes/intern/node_util.c
source/blender/nodes/intern/node_util.h
source/blender/nodes/shader/node_shader_tree.c [new file with mode: 0644]
source/blender/nodes/shader/node_shader_util.c [new file with mode: 0644]
source/blender/nodes/shader/node_shader_util.h [moved from source/blender/nodes/intern/SHD_util.h with 86% similarity]
source/blender/nodes/shader/nodes/node_shader_camera.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_camera.c with 80% similarity]
source/blender/nodes/shader/nodes/node_shader_common.c [new file with mode: 0644]
source/blender/nodes/shader/nodes/node_shader_curves.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_curves.c with 76% similarity]
source/blender/nodes/shader/nodes/node_shader_dynamic.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c with 99% similarity]
source/blender/nodes/shader/nodes/node_shader_geom.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_geom.c with 84% similarity]
source/blender/nodes/shader/nodes/node_shader_hueSatVal.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c with 77% similarity]
source/blender/nodes/shader/nodes/node_shader_invert.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_invert.c with 80% similarity]
source/blender/nodes/shader/nodes/node_shader_mapping.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_mapping.c with 85% similarity]
source/blender/nodes/shader/nodes/node_shader_material.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_material.c with 77% similarity]
source/blender/nodes/shader/nodes/node_shader_math.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_math.c with 92% similarity]
source/blender/nodes/shader/nodes/node_shader_mixRgb.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c with 79% similarity]
source/blender/nodes/shader/nodes/node_shader_normal.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_normal.c with 67% similarity]
source/blender/nodes/shader/nodes/node_shader_output.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_output.c with 83% similarity]
source/blender/nodes/shader/nodes/node_shader_rgb.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_rgb.c with 65% similarity]
source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c with 74% similarity]
source/blender/nodes/shader/nodes/node_shader_squeeze.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c with 70% similarity]
source/blender/nodes/shader/nodes/node_shader_texture.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_texture.c with 88% similarity]
source/blender/nodes/shader/nodes/node_shader_valToRgb.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c with 76% similarity]
source/blender/nodes/shader/nodes/node_shader_value.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_value.c with 66% similarity]
source/blender/nodes/shader/nodes/node_shader_vectMath.c [moved from source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c with 87% similarity]
source/blender/nodes/texture/node_texture_tree.c [new file with mode: 0644]
source/blender/nodes/texture/node_texture_util.c [moved from source/blender/nodes/intern/TEX_util.c with 78% similarity]
source/blender/nodes/texture/node_texture_util.h [moved from source/blender/nodes/intern/TEX_util.h with 93% similarity]
source/blender/nodes/texture/nodes/node_texture_at.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_at.c with 82% similarity]
source/blender/nodes/texture/nodes/node_texture_bricks.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_bricks.c with 76% similarity]
source/blender/nodes/texture/nodes/node_texture_checker.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_checker.c with 79% similarity]
source/blender/nodes/texture/nodes/node_texture_common.c [new file with mode: 0644]
source/blender/nodes/texture/nodes/node_texture_compose.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_compose.c with 71% similarity]
source/blender/nodes/texture/nodes/node_texture_coord.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_coord.c with 86% similarity]
source/blender/nodes/texture/nodes/node_texture_curves.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_curves.c with 80% similarity]
source/blender/nodes/texture/nodes/node_texture_decompose.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_decompose.c with 80% similarity]
source/blender/nodes/texture/nodes/node_texture_distance.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_distance.c with 84% similarity]
source/blender/nodes/texture/nodes/node_texture_hueSatVal.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c with 78% similarity]
source/blender/nodes/texture/nodes/node_texture_image.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_image.c with 86% similarity]
source/blender/nodes/texture/nodes/node_texture_invert.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_invert.c with 83% similarity]
source/blender/nodes/texture/nodes/node_texture_math.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_math.c with 89% similarity]
source/blender/nodes/texture/nodes/node_texture_mixRgb.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c with 79% similarity]
source/blender/nodes/texture/nodes/node_texture_output.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_output.c with 89% similarity]
source/blender/nodes/texture/nodes/node_texture_proc.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_proc.c with 72% similarity]
source/blender/nodes/texture/nodes/node_texture_rotate.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_rotate.c with 84% similarity]
source/blender/nodes/texture/nodes/node_texture_scale.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_scale.c with 85% similarity]
source/blender/nodes/texture/nodes/node_texture_texture.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_texture.c with 84% similarity]
source/blender/nodes/texture/nodes/node_texture_translate.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_translate.c with 82% similarity]
source/blender/nodes/texture/nodes/node_texture_valToNor.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c with 81% similarity]
source/blender/nodes/texture/nodes/node_texture_valToRgb.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c with 77% similarity]
source/blender/nodes/texture/nodes/node_texture_viewer.c [moved from source/blender/nodes/intern/TEX_nodes/TEX_viewer.c with 83% similarity]
source/blender/render/intern/source/render_texture.c
source/creator/CMakeLists.txt