[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel BKE_node.h blender/source/blender/blenkernel/intern node.c blender/source/blender/makesdna DNA_node_types.h blender/source/blender/nodes CMP_node.h SHD_node.h blender/source/blender/nodes/intern/CMP_nodes CMP_alphaOver.c CMP_blur.c ...

Mon Mar 26 17:07:38 CEST 2007

ton (Ton Roosendaal) 2007/03/26 17:07:38 CEST

  Modified files:
    blender/source/blender/blenkernel BKE_node.h 
    blender/source/blender/blenkernel/intern node.c 
    blender/source/blender/makesdna DNA_node_types.h 
    blender/source/blender/nodes CMP_node.h SHD_node.h 
    blender/source/blender/nodes/intern/CMP_nodes CMP_alphaOver.c 
                                                  CMP_blur.c 
                                                  CMP_channelMatte.c 
                                                  CMP_chromaMatte.c 
                                                  CMP_colorSpill.c 
                                                  CMP_composite.c 
                                                  CMP_curves.c 
                                                  CMP_defocus.c 
                                                  CMP_diffMatte.c 
                                                  CMP_dilate.c 
                                                  CMP_displace.c 
                                                  CMP_filter.c 
                                                  CMP_flip.c 
                                                  CMP_hueSatVal.c 
                                                  CMP_idMask.c 
                                                  CMP_image.c 
                                                  CMP_lummaMatte.c 
                                                  CMP_mapUV.c 
                                                  CMP_mapValue.c 
                                                  CMP_math.c 
                                                  CMP_mixrgb.c 
                                                  CMP_normal.c 
                                                  CMP_outputFile.c 
                                                  CMP_rgb.c 
                                                  CMP_rotate.c 
                                                  CMP_scale.c 
                                                  CMP_sepcombHSVA.c 
                                                  CMP_sepcombRGBA.c 
                                                  CMP_sepcombYCCA.c 
                                                  CMP_sepcombYUVA.c 
                                                  CMP_setalpha.c 
                                                  CMP_splitViewer.c 
                                                  CMP_texture.c 
                                                  CMP_translate.c 
                                                  CMP_valToRgb.c 
                                                  CMP_value.c 
                                                  CMP_vecBlur.c 
                                                  CMP_viewer.c 
                                                  CMP_zcombine.c 
    blender/source/blender/nodes/intern/SHD_nodes SHD_camera.c 
                                                  SHD_curves.c 
                                                  SHD_geom.c 
                                                  SHD_mapping.c 
                                                  SHD_material.c 
                                                  SHD_math.c 
                                                  SHD_mixRgb.c 
                                                  SHD_normal.c 
                                                  SHD_output.c 
                                                  SHD_rgb.c 
                                                  SHD_squeeze.c 
                                                  SHD_texture.c 
                                                  SHD_valToRgb.c 
                                                  SHD_value.c 
                                                  SHD_vectMath.c 
    blender/source/blender/src drawnode.c header_node.c toolbox.c 
                               usiblender.c 
    blender/source/creator creator.c 

  Log:
  Changed node type definitions to use a dynamic list.
  This will allow python or plugin defined nodes to work as well.
  (And fixes compile issues with MSVC in yesterdays commit for nodes)

  Code provided by Nathan L.
  Fixes in his code:
  - free_nodesystem() was called too late (after guarded alloc was closed)
  - free_nodesystem() was freeing nodes that were not malloced even
  - free_nodesystem was using free, not freeN :)
  - the typedefs needed to be malloced yes, to allow duplicate nodes like
    group but also for dynamic nodes.

  Revision  Changes    Path
  1.42      +8 -3      blender/source/blender/blenkernel/BKE_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/BKE_node.h.diff?r1=1.41&r2=1.42&cvsroot=bf-blender>
  1.74      +139 -13   blender/source/blender/blenkernel/intern/node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/node.c.diff?r1=1.73&r2=1.74&cvsroot=bf-blender>
  1.27      +6 -5      blender/source/blender/makesdna/DNA_node_types.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/makesdna/DNA_node_types.h.diff?r1=1.26&r2=1.27&cvsroot=bf-blender>
  1.4       +3 -62     blender/source/blender/nodes/CMP_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/CMP_node.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.4       +1 -25     blender/source/blender/nodes/SHD_node.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/SHD_node.h.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +4 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_dilate.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_flip.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_idMask.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_normal.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_normal.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_scale.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombRGBA.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYUVA.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_setalpha.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_translate.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_translate.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_value.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_value.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/CMP_nodes/CMP_zcombine.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_camera.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +3 -2      blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_math.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_normal.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_output.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_texture.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +3 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.3       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_value.c.diff?r1=1.2&r2=1.3&cvsroot=bf-blender>
  1.4       +2 -1      blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c.diff?r1=1.3&r2=1.4&cvsroot=bf-blender>
  1.68      +9 -9      blender/source/blender/src/drawnode.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/drawnode.c.diff?r1=1.67&r2=1.68&cvsroot=bf-blender>
  1.18      +11 -6     blender/source/blender/src/header_node.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/header_node.c.diff?r1=1.17&r2=1.18&cvsroot=bf-blender>
  1.158     +13 -9     blender/source/blender/src/toolbox.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/toolbox.c.diff?r1=1.157&r2=1.158&cvsroot=bf-blender>
  1.145     +6 -3      blender/source/blender/src/usiblender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/src/usiblender.c.diff?r1=1.144&r2=1.145&cvsroot=bf-blender>
  1.70      +4 -1      blender/source/creator/creator.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/creator/creator.c.diff?r1=1.69&r2=1.70&cvsroot=bf-blender>