[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55394] branches/soc-2008-mxcurioni: svn merge ^/trunk/blender -r55372:55392
Campbell Barton
ideasman42 at gmail.com
Mon Mar 18 23:37:05 CET 2013
Revision: 55394
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55394
Author: campbellbarton
Date: 2013-03-18 22:37:04 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
svn merge ^/trunk/blender -r55372:55392
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55372
Modified Paths:
--------------
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/smoke/intern/smoke_API.cpp
branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/node.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/collada_utils.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_CompositorContext.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_CompositorContext.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_NodeBase.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Socket.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Socket.h
branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_NormalNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_node.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_add.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_group.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_relationships.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_view.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_socket.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_texture.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_pixelate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hair_info.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_object_info.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_at.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
Added Paths:
-----------
branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.NodeTree.py
branches/soc-2008-mxcurioni/release/scripts/templates_py/custom_nodes.py
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_common.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_static_types.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55372
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-51853,51855-55392
Copied: branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.NodeTree.py (from rev 55392, trunk/blender/doc/python_api/examples/bpy.types.NodeTree.py)
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.NodeTree.py (rev 0)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.NodeTree.py 2013-03-18 22:37:04 UTC (rev 55394)
@@ -0,0 +1,23 @@
+"""
+Poll Function
++++++++++++++++
+The :class:`NodeTree.poll` function determines if a node tree is visible
+in the given context (similar to how :class:`Panel.poll`
+and :class:`Menu.poll` define visibility). If it returns False,
+the node tree type will not be selectable in the node editor.
+
+A typical condition for shader nodes would be to check the active render engine
+of the scene and only show nodes of the renderer they are designed for.
+"""
+import bpy
+
+
+class CyclesNodeTree(bpy.types.NodeTree):
+ """ This operator is only visible when Cycles is the selected render engine"""
+ bl_label = "Cycles Node Tree"
+
+ @classmethod
+ def poll(cls, context):
+ return context.scene.render.engine == 'CYCLES'
+
+bpy.utils.register_class(CyclesNodeTree)
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp 2013-03-18 22:28:27 UTC (rev 55393)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp 2013-03-18 22:37:04 UTC (rev 55394)
@@ -207,6 +207,7 @@
}
#ifdef WITH_OSL
+
static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
{
PyObject *pynodegroup, *pynode;
@@ -248,17 +249,19 @@
continue;
/* determine socket type */
- BL::NodeSocket::type_enum socket_type;
- float default_float4[4] = {0.0f, 0.0f, 0.0f, 1.0f};
+ std::string socket_type;
+ BL::NodeSocket::type_enum data_type = BL::NodeSocket::type_VALUE;
+ float4 default_float4 = make_float4(0.0f, 0.0f, 0.0f, 1.0f);
float default_float = 0.0f;
int default_int = 0;
std::string default_string = "";
if(param->isclosure) {
- socket_type = BL::NodeSocket::type_SHADER;
+ socket_type = "NodeSocketShader";
}
else if(param->type.vecsemantics == TypeDesc::COLOR) {
- socket_type = BL::NodeSocket::type_RGBA;
+ socket_type = "NodeSocketColor";
+ data_type = BL::NodeSocket::type_RGBA;
if(param->validdefault) {
default_float4[0] = param->fdefault[0];
@@ -269,7 +272,8 @@
else if(param->type.vecsemantics == TypeDesc::POINT ||
param->type.vecsemantics == TypeDesc::VECTOR ||
param->type.vecsemantics == TypeDesc::NORMAL) {
- socket_type = BL::NodeSocket::type_VECTOR;
+ socket_type = "NodeSocketVector";
+ data_type = BL::NodeSocket::type_VECTOR;
if(param->validdefault) {
default_float4[0] = param->fdefault[0];
@@ -279,17 +283,20 @@
}
else if(param->type.aggregate == TypeDesc::SCALAR) {
if(param->type.basetype == TypeDesc::INT) {
- socket_type = BL::NodeSocket::type_INT;
+ socket_type = "NodeSocketInt";
+ data_type = BL::NodeSocket::type_INT;
if(param->validdefault)
default_int = param->idefault[0];
}
else if(param->type.basetype == TypeDesc::FLOAT) {
- socket_type = BL::NodeSocket::type_VALUE;
+ socket_type = "NodeSocketFloat";
+ data_type = BL::NodeSocket::type_VALUE;
if(param->validdefault)
default_float = param->fdefault[0];
}
else if(param->type.basetype == TypeDesc::STRING) {
- socket_type = BL::NodeSocket::type_STRING;
+ socket_type = "NodeSocketString";
+ data_type = BL::NodeSocket::type_STRING;
if(param->validdefault)
default_string = param->sdefault[0];
}
@@ -300,38 +307,52 @@
continue;
/* find socket socket */
- BL::NodeSocket b_sock = b_node.find_socket(param->name.c_str(), param->isoutput);
-
- /* remove if type no longer matches */
- if(b_sock && b_sock.type() != socket_type) {
- b_node.remove_socket(b_sock);
- b_sock = BL::NodeSocket(PointerRNA_NULL);
+ BL::NodeSocket b_sock(PointerRNA_NULL);
+ if (param->isoutput) {
+ b_sock = b_node.outputs[param->name];
+
+ /* remove if type no longer matches */
+ if(b_sock && b_sock.bl_idname() != socket_type) {
+ b_node.outputs.remove(b_sock);
+ b_sock = BL::NodeSocket(PointerRNA_NULL);
+ }
+
+ if (!b_sock) {
+ /* create new socket */
+ b_sock = b_node.outputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
+ }
}
+ else {
+ b_sock = b_node.inputs[param->name];
+
+ /* remove if type no longer matches */
+ if(b_sock && b_sock.bl_idname() != socket_type) {
+ b_node.inputs.remove(b_sock);
+ b_sock = BL::NodeSocket(PointerRNA_NULL);
+ }
+
+ if (!b_sock) {
+ /* create new socket */
+ b_sock = b_node.inputs.create(socket_type.c_str(), param->name.c_str(), param->name.c_str());
+ }
+ }
- /* create new socket */
- if(!b_sock) {
- b_sock = b_node.add_socket(param->name.c_str(), socket_type, param->isoutput);
-
- /* set default value */
- if(socket_type == BL::NodeSocket::type_VALUE) {
- BL::NodeSocketFloatNone b_float_sock(b_sock.ptr);
- b_float_sock.default_value(default_float);
+ /* set default value */
+ if(b_sock) {
+ if(data_type == BL::NodeSocket::type_VALUE) {
+ set_float(b_sock.ptr, "default_value", default_float);
}
- else if(socket_type == BL::NodeSocket::type_INT) {
- BL::NodeSocketIntNone b_int_sock(b_sock.ptr);
- b_int_sock.default_value(default_int);
+ else if(data_type == BL::NodeSocket::type_INT) {
+ set_int(b_sock.ptr, "default_value", default_int);
}
- else if(socket_type == BL::NodeSocket::type_RGBA) {
- BL::NodeSocketRGBA b_rgba_sock(b_sock.ptr);
- b_rgba_sock.default_value(default_float4);
+ else if(data_type == BL::NodeSocket::type_RGBA) {
+ set_float4(b_sock.ptr, "default_value", default_float4);
}
- else if(socket_type == BL::NodeSocket::type_VECTOR) {
- BL::NodeSocketVectorNone b_vector_sock(b_sock.ptr);
- b_vector_sock.default_value(default_float4);
+ else if(data_type == BL::NodeSocket::type_VECTOR) {
+ set_float3(b_sock.ptr, "default_value", float4_to_float3(default_float4));
}
- else if(socket_type == BL::NodeSocket::type_STRING) {
- BL::NodeSocketStringNone b_string_sock(b_sock.ptr);
- b_string_sock.default_value(default_string);
+ else if(data_type == BL::NodeSocket::type_STRING) {
+ set_string(b_sock.ptr, "default_value", default_string);
}
}
@@ -349,7 +370,7 @@
for (b_node.inputs.begin(b_input); b_input != b_node.inputs.end(); ++b_input) {
if(used_sockets.find(b_input->ptr.data) == used_sockets.end()) {
- b_node.remove_socket(*b_input);
+ b_node.inputs.remove(*b_input);
removed = true;
break;
}
@@ -357,7 +378,7 @@
for (b_node.outputs.begin(b_output); b_output != b_node.outputs.end(); ++b_output) {
if(used_sockets.find(b_output->ptr.data) == used_sockets.end()) {
- b_node.remove_socket(*b_output);
+ b_node.outputs.remove(*b_output);
removed = true;
break;
}
Modified: branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp 2013-03-18 22:28:27 UTC (rev 55393)
+++ branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp 2013-03-18 22:37:04 UTC (rev 55394)
@@ -31,9 +31,9 @@
CCL_NAMESPACE_BEGIN
-typedef map<void*, ShaderNode*> PtrNodeMap;
-typedef pair<ShaderNode*, std::string> SocketPair;
-typedef map<void*, SocketPair> PtrSockMap;
+typedef map<void*, ShaderInput*> PtrInputMap;
+typedef map<void*, ShaderOutput*> PtrOutputMap;
+typedef map<std::string, ProxyNode*> ProxyMap;
/* Find */
@@ -55,83 +55,88 @@
static BL::NodeSocket get_node_output(BL::Node b_node, const string& name)
{
BL::Node::outputs_iterator b_out;
-
+
for(b_node.outputs.begin(b_out); b_out != b_node.outputs.end(); ++b_out)
if(b_out->name() == name)
return *b_out;
-
+
assert(0);
-
+
return *b_out;
}
static float3 get_node_output_rgba(BL::Node b_node, const string& name)
{
- BL::NodeSocketRGBA sock(get_node_output(b_node, name));
- return get_float3(sock.default_value());
+ BL::NodeSocket b_sock = get_node_output(b_node, name);
+ float value[4];
+ RNA_float_get_array(&b_sock.ptr, "default_value", value);
+ return make_float3(value[0], value[1], value[2]);
}
static float get_node_output_value(BL::Node b_node, const string& name)
{
- BL::NodeSocketFloatNone sock(get_node_output(b_node, name));
- return sock.default_value();
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list