[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39949] branches/vgroup_modifiers: svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Tue Sep 6 02:31:00 CEST 2011
Revision: 39949
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39949
Author: campbellbarton
Date: 2011-09-06 00:31:00 +0000 (Tue, 06 Sep 2011)
Log Message:
-----------
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39930
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/vgroup_modifiers/intern/opennl/CMakeLists.txt
branches/vgroup_modifiers/intern/smoke/CMakeLists.txt
branches/vgroup_modifiers/intern/smoke/SConscript
branches/vgroup_modifiers/intern/smoke/intern/FFT_NOISE.h
branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.cpp
branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_sound.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/material.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/node.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sound.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_inline.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h
branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector.c
branches/vgroup_modifiers/source/blender/blenlib/intern/noise.c
branches/vgroup_modifiers/source/blender/blenloader/CMakeLists.txt
branches/vgroup_modifiers/source/blender/blenloader/SConscript
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
branches/vgroup_modifiers/source/blender/collada/AnimationExporter.cpp
branches/vgroup_modifiers/source/blender/collada/AnimationImporter.cpp
branches/vgroup_modifiers/source/blender/collada/AnimationImporter.h
branches/vgroup_modifiers/source/blender/collada/ArmatureImporter.cpp
branches/vgroup_modifiers/source/blender/collada/CMakeLists.txt
branches/vgroup_modifiers/source/blender/collada/DocumentImporter.cpp
branches/vgroup_modifiers/source/blender/collada/TransformReader.cpp
branches/vgroup_modifiers/source/blender/collada/collada.cpp
branches/vgroup_modifiers/source/blender/editors/animation/anim_ops.c
branches/vgroup_modifiers/source/blender/editors/include/ED_node.h
branches/vgroup_modifiers/source/blender/editors/include/ED_sequencer.h
branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
branches/vgroup_modifiers/source/blender/editors/sound/sound_ops.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_ops.c
branches/vgroup_modifiers/source/blender/editors/space_logic/logic_ops.c
branches/vgroup_modifiers/source/blender/editors/space_logic/logic_window.c
branches/vgroup_modifiers/source/blender/editors/space_node/drawnode.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_buttons.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_header.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h
branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_select.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_state.c
branches/vgroup_modifiers/source/blender/editors/space_node/space_node.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_edit.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/space_sequencer.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c
branches/vgroup_modifiers/source/blender/gpu/SConscript
branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/cineonlib.c
branches/vgroup_modifiers/source/blender/imbuf/intern/cineon/logImageCore.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_enum_types.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_types.h
branches/vgroup_modifiers/source/blender/makesrna/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/CMakeLists.txt
branches/vgroup_modifiers/source/blender/makesrna/intern/SConscript
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_actuator.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_main_api.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_particle.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_rna.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_screen.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_smoke.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_texture.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
branches/vgroup_modifiers/source/blender/modifiers/CMakeLists.txt
branches/vgroup_modifiers/source/blender/modifiers/SConscript
branches/vgroup_modifiers/source/blender/nodes/CMakeLists.txt
branches/vgroup_modifiers/source/blender/nodes/SConscript
branches/vgroup_modifiers/source/blender/nodes/intern/node_util.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_util.h
branches/vgroup_modifiers/source/blender/render/intern/source/render_texture.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/vgroup_modifiers/source/creator/CMakeLists.txt
branches/vgroup_modifiers/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/vgroup_modifiers/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
branches/vgroup_modifiers/source/blender/collada/ErrorHandler.cpp
branches/vgroup_modifiers/source/blender/collada/ErrorHandler.h
branches/vgroup_modifiers/source/blender/nodes/NOD_composite.h
branches/vgroup_modifiers/source/blender/nodes/NOD_shader.h
branches/vgroup_modifiers/source/blender/nodes/NOD_socket.h
branches/vgroup_modifiers/source/blender/nodes/NOD_texture.h
branches/vgroup_modifiers/source/blender/nodes/composite/
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_tree.c
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.c
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.h
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_common.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_math.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_value.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_common.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_common.h
branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.h
branches/vgroup_modifiers/source/blender/nodes/intern/node_socket.c
branches/vgroup_modifiers/source/blender/nodes/shader/
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_tree.c
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.c
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.h
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_common.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_material.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_math.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_value.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/vgroup_modifiers/source/blender/nodes/texture/
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_tree.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_util.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_util.h
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_at.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_image.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_math.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_output.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_viewer.c
Removed Paths:
-------------
branches/vgroup_modifiers/source/blender/nodes/CMP_node.h
branches/vgroup_modifiers/source/blender/nodes/SHD_node.h
branches/vgroup_modifiers/source/blender/nodes/TEX_node.h
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_tree.c
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.c
branches/vgroup_modifiers/source/blender/nodes/composite/node_composite_util.h
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_common.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_math.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_value.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/vgroup_modifiers/source/blender/nodes/intern/CMP_nodes/
branches/vgroup_modifiers/source/blender/nodes/intern/CMP_util.c
branches/vgroup_modifiers/source/blender/nodes/intern/CMP_util.h
branches/vgroup_modifiers/source/blender/nodes/intern/SHD_nodes/
branches/vgroup_modifiers/source/blender/nodes/intern/SHD_util.c
branches/vgroup_modifiers/source/blender/nodes/intern/SHD_util.h
branches/vgroup_modifiers/source/blender/nodes/intern/TEX_nodes/
branches/vgroup_modifiers/source/blender/nodes/intern/TEX_util.c
branches/vgroup_modifiers/source/blender/nodes/intern/TEX_util.h
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_tree.c
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.c
branches/vgroup_modifiers/source/blender/nodes/shader/node_shader_util.h
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_common.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_material.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_math.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_output.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_value.c
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_tree.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_util.c
branches/vgroup_modifiers/source/blender/nodes/texture/node_texture_util.h
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_at.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_image.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_math.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_output.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_viewer.c
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/space_outliner/
Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39930
+ /trunk/blender:38694-38739,38741-39198,39200-39651,39653-39947
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/CMakeLists.txt 2011-09-06 00:31:00 UTC (rev 39949)
@@ -1267,6 +1267,7 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
# disable because it gives warnings for printf() & friends.
# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1274,6 +1275,7 @@
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
Modified: branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManager.cpp 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/ghost/intern/GHOST_NDOFManager.cpp 2011-09-06 00:31:00 UTC (rev 39949)
@@ -366,11 +366,11 @@
}
else if (dz > 0.5f) {
// warn the rogue user/programmer, but allow it
- printf("ndof: dead zone of %.2f is rather high...\n", dz);
+ GHOST_PRINTF("ndof: dead zone of %.2f is rather high...\n", dz);
}
m_deadZone = dz;
- printf("ndof: dead zone set to %.2f\n", dz);
+ GHOST_PRINTF("ndof: dead zone set to %.2f\n", dz);
}
static bool atHomePosition(GHOST_TEventNDOFMotionData* ndof)
Modified: branches/vgroup_modifiers/intern/opennl/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/intern/opennl/CMakeLists.txt 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/opennl/CMakeLists.txt 2011-09-06 00:31:00 UTC (rev 39949)
@@ -31,6 +31,13 @@
# and debug gives a lot of prints on UV unwrapping. developers can enable if they need to.
remove_flag("-DDEBUG")
+
+# quiet compiler warnings about undefined defines
+add_definitions(
+ -DDEBUGlevel=0
+ -DPRNTlevel=0
+)
+
set(INC
extern
superlu
Modified: branches/vgroup_modifiers/intern/smoke/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/intern/smoke/CMakeLists.txt 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/smoke/CMakeLists.txt 2011-09-06 00:31:00 UTC (rev 39949)
@@ -88,7 +88,7 @@
endif()
if(WITH_FFTW3)
- add_definitions(-DFFTW3=1)
+ add_definitions(-DWITH_FFTW3)
list(APPEND INC
${FFTW3_INCLUDE_DIRS}
)
Modified: branches/vgroup_modifiers/intern/smoke/SConscript
===================================================================
--- branches/vgroup_modifiers/intern/smoke/SConscript 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/smoke/SConscript 2011-09-06 00:31:00 UTC (rev 39949)
@@ -16,7 +16,7 @@
incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
if env['WITH_BF_FFTW3']:
- defs += ' FFTW3=1'
+ defs += ' WITH_FFTW3'
incs += env['BF_FFTW3_INC']
env.BlenderLib ('bf_intern_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
Modified: branches/vgroup_modifiers/intern/smoke/intern/FFT_NOISE.h
===================================================================
--- branches/vgroup_modifiers/intern/smoke/intern/FFT_NOISE.h 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/smoke/intern/FFT_NOISE.h 2011-09-06 00:31:00 UTC (rev 39949)
@@ -25,7 +25,7 @@
#ifndef FFT_NOISE_H_
#define FFT_NOISE_H_
-#if FFTW3==1
+#ifdef WITH_FFTW3
#include <iostream>
#include <fftw3.h>
#include <MERSENNETWISTER.h>
Modified: branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.cpp
===================================================================
--- branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.cpp 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/intern/smoke/intern/WTURBULENCE.cpp 2011-09-06 00:31:00 UTC (rev 39949)
@@ -155,7 +155,7 @@
if(type == (1<<1)) // FFT
{
// needs fft
- #if FFTW3==1
+ #ifdef WITH_FFTW3
std::string noiseTileFilename = std::string("noise.fft");
generatTile_FFT(_noiseTile, noiseTileFilename);
#endif
Modified: branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h 2011-09-06 00:31:00 UTC (rev 39949)
@@ -44,7 +44,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 259
-#define BLENDER_SUBVERSION 1
+#define BLENDER_SUBVERSION 2
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h 2011-09-06 00:12:34 UTC (rev 39948)
+++ branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h 2011-09-06 00:31:00 UTC (rev 39949)
@@ -37,6 +37,10 @@
* \ingroup bke
*/
+#include "DNA_listBase.h"
+
+#include "RNA_types.h"
+
/* not very important, but the stack solver likes to know a maximum */
#define MAX_SOCKET 64
@@ -46,63 +50,151 @@
struct bNodeSocket;
struct bNodeStack;
struct bNodeTree;
+struct bNodeTreeExec;
struct GPUMaterial;
struct GPUNode;
struct GPUNodeStack;
struct ID;
struct ListBase;
struct Main;
+struct uiBlock;
+struct uiLayout;
struct MTex;
struct PointerRNA;
struct rctf;
struct RenderData;
struct Scene;
struct Tex;
-struct uiLayout;
+struct SpaceNode;
+struct ARegion;
+struct Object;
-
/* ************** NODE TYPE DEFINITIONS ***** */
-typedef struct bNodeSocketType {
+/** Compact definition of a node socket.
+ * Can be used to quickly define a list of static sockets for a node,
+ * which are added to each new node of that type.
+ *
+ * \deprecated New nodes should add default sockets in the initialization
+ * function instead. This struct is mostly kept for old nodes and should
+ * be removed some time.
+ */
+typedef struct bNodeSocketTemplate {
int type, limit;
- const char *name;
- float val1, val2, val3, val4; /* default alloc value for inputs */
- float min, max; /* default range for inputs */
+ char name[32];
+ float val1, val2, val3, val4; /* default alloc value for inputs */
+ float min, max;
+ PropertySubType subtype;
/* after this line is used internal only */
- struct bNodeSocket *sock; /* used during verify_types */
+ struct bNodeSocket *sock; /* used to hold verified socket */
+} bNodeSocketTemplate;
+
+typedef void (*NodeSocketButtonFunction)(const struct bContext *C, struct uiBlock *block,
+ struct bNodeTree *ntree, struct bNode *node, struct bNodeSocket *sock,
+ const char *name, int x, int y, int width);
+
+/** Defines a socket type.
+ * Defines the appearance and behavior of a socket in the UI.
+ */
+typedef struct bNodeSocketType {
+ int type;
+ char ui_name[32];
+ char ui_description[128];
+ int ui_icon;
+ char ui_color[4];
+
+ const char *value_structname;
+ int value_structsize;
+
+ NodeSocketButtonFunction buttonfunc;
} bNodeSocketType;
+/** Template for creating a node.
+ * Stored required parameters to make a new node of a specific type.
+ */
+typedef struct bNodeTemplate {
+ int type;
+
+ /* group tree */
+ struct bNodeTree *ngroup;
+} bNodeTemplate;
+
+/** Defines a node type.
+ * Initial attributes and constants for a node as well as callback functions
+ * implementing the node behavior.
+ */
typedef struct bNodeType {
void *next,*prev;
+ short needs_free; /* set for allocated types that need to be freed */
+
int type;
- const char *name; /* can be allocated too */
+ char name[32];
float width, minwidth, maxwidth;
+ float height, minheight, maxheight;
short nclass, flag;
- bNodeSocketType *inputs, *outputs;
+ /* templates for static sockets */
+ bNodeSocketTemplate *inputs, *outputs;
char storagename[64]; /* struct name for DNA */
- void (*execfunc)(void *data, struct bNode *, struct bNodeStack **, struct bNodeStack **);
-
- /* this line is set on startup of blender */
+ /// Main draw function for the node.
+ void (*drawfunc)(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode, struct bNodeTree *ntree, struct bNode *node);
+ /// Updates the node geometry attributes according to internal state before actual drawing.
+ void (*drawupdatefunc)(const struct bContext *C, struct bNodeTree *ntree, struct bNode *node);
+ /// Draw the option buttons on the node.
void (*uifunc)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+ /// Additional parameters in the side panel.
void (*uifuncbut)(struct uiLayout *, struct bContext *C, struct PointerRNA *ptr);
+ /// Optional custom label function for the node header.
const char *(*labelfunc)(struct bNode *);
-
- void (*initfunc)(struct bNode *);
- void (*freestoragefunc)(struct bNode *);
- void (*copystoragefunc)(struct bNode *, struct bNode *);
+ /// Optional custom resize handle polling.
+ int (*resize_area_func)(struct bNode *node, int x, int y);
- /* for use with dynamic typedefs */
- ID *id;
- void *pynode; /* holds pointer to python script */
- void *pydict; /* holds pointer to python script dictionary (scope)*/
-
+ /// Called when the node is updated in the editor.
+ void (*updatefunc)(struct bNodeTree *ntree, struct bNode *node);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list