Merging r46725 through r46963 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 24 May 2012 09:47:29 +0000 (09:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 24 May 2012 09:47:29 +0000 (09:47 +0000)
997 files changed:
CMakeLists.txt
SConstruct
build_files/scons/config/win32-mingw-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
doc/python_api/examples/bpy.types.Mesh.py
doc/python_api/rst/include__bmesh.rst
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/kernel_object.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_geometry.h
intern/cycles/kernel/svm/svm_tex_coord.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/film.cpp
intern/cycles/render/graph.cpp
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
intern/cycles/render/object.cpp
intern/cycles/render/object.h
intern/cycles/util/util_hash.h
intern/elbeem/CMakeLists.txt
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_IEvent.h
intern/ghost/GHOST_IEventConsumer.h
intern/ghost/GHOST_ISystem.h
intern/ghost/GHOST_ISystemPaths.h
intern/ghost/GHOST_ITimerTask.h
intern/ghost/GHOST_IWindow.h
intern/ghost/GHOST_Path-api.h
intern/ghost/GHOST_Rect.h
intern/ghost/GHOST_Types.h
intern/ghost/intern/GHOST_Buttons.cpp
intern/ghost/intern/GHOST_Buttons.h
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
intern/ghost/intern/GHOST_CallbackEventConsumer.h
intern/ghost/intern/GHOST_DisplayManager.cpp
intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
intern/ghost/intern/GHOST_DisplayManagerCarbon.h
intern/ghost/intern/GHOST_DisplayManagerNULL.h
intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
intern/ghost/intern/GHOST_DisplayManagerSDL.h
intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
intern/ghost/intern/GHOST_DisplayManagerX11.cpp
intern/ghost/intern/GHOST_DisplayManagerX11.h
intern/ghost/intern/GHOST_DropTargetWin32.cpp
intern/ghost/intern/GHOST_DropTargetWin32.h
intern/ghost/intern/GHOST_DropTargetX11.cpp
intern/ghost/intern/GHOST_DropTargetX11.h
intern/ghost/intern/GHOST_Event.h
intern/ghost/intern/GHOST_EventButton.h
intern/ghost/intern/GHOST_EventCursor.h
intern/ghost/intern/GHOST_EventDragnDrop.h
intern/ghost/intern/GHOST_EventKey.h
intern/ghost/intern/GHOST_EventManager.cpp
intern/ghost/intern/GHOST_EventManager.h
intern/ghost/intern/GHOST_EventNDOF.h
intern/ghost/intern/GHOST_EventPrinter.cpp
intern/ghost/intern/GHOST_EventPrinter.h
intern/ghost/intern/GHOST_EventString.h
intern/ghost/intern/GHOST_EventTrackpad.h
intern/ghost/intern/GHOST_EventWheel.h
intern/ghost/intern/GHOST_ISystem.cpp
intern/ghost/intern/GHOST_ISystemPaths.cpp
intern/ghost/intern/GHOST_ModifierKeys.cpp
intern/ghost/intern/GHOST_ModifierKeys.h
intern/ghost/intern/GHOST_NDOFManager.cpp
intern/ghost/intern/GHOST_NDOFManager.h
intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
intern/ghost/intern/GHOST_NDOFManagerX11.cpp
intern/ghost/intern/GHOST_Path-api.cpp
intern/ghost/intern/GHOST_Rect.cpp
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
intern/ghost/intern/GHOST_SystemCarbon.cpp
intern/ghost/intern/GHOST_SystemCarbon.h
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemNULL.h
intern/ghost/intern/GHOST_SystemPaths.h
intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
intern/ghost/intern/GHOST_SystemPathsCarbon.h
intern/ghost/intern/GHOST_SystemPathsCocoa.h
intern/ghost/intern/GHOST_SystemPathsWin32.cpp
intern/ghost/intern/GHOST_SystemPathsWin32.h
intern/ghost/intern/GHOST_SystemPathsX11.cpp
intern/ghost/intern/GHOST_SystemPathsX11.h
intern/ghost/intern/GHOST_SystemSDL.cpp
intern/ghost/intern/GHOST_SystemSDL.h
intern/ghost/intern/GHOST_SystemWin32.cpp
intern/ghost/intern/GHOST_SystemWin32.h
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
intern/ghost/intern/GHOST_TaskbarWin32.h
intern/ghost/intern/GHOST_TimerManager.cpp
intern/ghost/intern/GHOST_TimerManager.h
intern/ghost/intern/GHOST_TimerTask.h
intern/ghost/intern/GHOST_Window.cpp
intern/ghost/intern/GHOST_Window.h
intern/ghost/intern/GHOST_WindowCarbon.cpp
intern/ghost/intern/GHOST_WindowCarbon.h
intern/ghost/intern/GHOST_WindowCocoa.h
intern/ghost/intern/GHOST_WindowCocoa.mm
intern/ghost/intern/GHOST_WindowManager.cpp
intern/ghost/intern/GHOST_WindowManager.h
intern/ghost/intern/GHOST_WindowNULL.h
intern/ghost/intern/GHOST_WindowSDL.cpp
intern/ghost/intern/GHOST_WindowSDL.h
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowWin32.h
intern/ghost/intern/GHOST_WindowX11.cpp
intern/ghost/intern/GHOST_WindowX11.h
intern/ghost/test/gears/GHOST_Test.cpp
intern/guardedalloc/intern/mmap_win.c
release/datafiles/blender_icons.png
release/scripts/startup/bl_operators/console.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_operators/presets.py
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/properties_animviz.py
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_graph.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_node.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/avi/intern/avi.c
source/blender/avi/intern/avirgb.c
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_screen.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/CCGSubSurf.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/image_gen.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/ocean.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/screen.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenkernel/intern/unit.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/intern/BLI_args.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/fnmatch.c
source/blender/blenlib/intern/math_rotation.c
source/blender/blenlib/intern/noise.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenlib/intern/string.c
source/blender/blenlib/intern/uvproject.c
source/blender/blenlib/intern/winstuff.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_250.c
source/blender/blenloader/intern/versioning_legacy.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_interp.c
source/blender/bmesh/intern/bmesh_marking.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mods.c
source/blender/bmesh/intern/bmesh_operators.c
source/blender/bmesh/intern/bmesh_polygon.c
source/blender/bmesh/intern/bmesh_queries.c
source/blender/bmesh/intern/bmesh_queries.h
source/blender/bmesh/operators/bmo_connect.c
source/blender/bmesh/operators/bmo_create.c
source/blender/bmesh/operators/bmo_extrude.c
source/blender/bmesh/operators/bmo_slide.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/collada/ArmatureImporter.cpp
source/blender/compositor/CMakeLists.txt [new file with mode: 0644]
source/blender/compositor/COM_compositor.h [new file with mode: 0644]
source/blender/compositor/COM_defines.h [new file with mode: 0644]
source/blender/compositor/SConscript [new file with mode: 0644]
source/blender/compositor/intern/COM_CPUDevice.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_CPUDevice.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ChannelInfo.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ChannelInfo.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ChunkOrder.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ChunkOrder.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ChunkOrderHotspot.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ChunkOrderHotspot.h [new file with mode: 0644]
source/blender/compositor/intern/COM_CompositorContext.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_CompositorContext.h [new file with mode: 0644]
source/blender/compositor/intern/COM_Converter.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_Converter.h [new file with mode: 0644]
source/blender/compositor/intern/COM_Device.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_Device.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionGroup.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionGroup.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionSystem.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionSystem.h [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_ExecutionSystemHelper.h [new file with mode: 0644]
source/blender/compositor/intern/COM_InputSocket.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_InputSocket.h [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryBuffer.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryBuffer.h [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryManager.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryManager.h [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryManagerState.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryManagerState.h [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryProxy.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_MemoryProxy.h [new file with mode: 0644]
source/blender/compositor/intern/COM_Node.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_Node.h [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeBase.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeBase.h [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeOperation.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeOperation.h [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeProgram.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_NodeProgram.h [new file with mode: 0644]
source/blender/compositor/intern/COM_OpenCLDevice.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_OpenCLDevice.h [new file with mode: 0644]
source/blender/compositor/intern/COM_OutputSocket.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_OutputSocket.h [new file with mode: 0644]
source/blender/compositor/intern/COM_Socket.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_Socket.h [new file with mode: 0644]
source/blender/compositor/intern/COM_SocketConnection.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_SocketConnection.h [new file with mode: 0644]
source/blender/compositor/intern/COM_SocketReader.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_SocketReader.h [new file with mode: 0644]
source/blender/compositor/intern/COM_WorkPackage.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_WorkPackage.h [new file with mode: 0644]
source/blender/compositor/intern/COM_WorkScheduler.cpp [new file with mode: 0644]
source/blender/compositor/intern/COM_WorkScheduler.h [new file with mode: 0644]
source/blender/compositor/intern/COM_compositor.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_AlphaOverNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_AlphaOverNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BilateralBlurNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BilateralBlurNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BlurNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BlurNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BokehBlurNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BokehBlurNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BokehImageNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BokehImageNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BoxMaskNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BoxMaskNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_BrightnessNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_BrightnessNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ChannelMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ChannelMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ChromaMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ChromaMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorBalanceNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorBalanceNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorCorrectionNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorCurveNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorCurveNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorRampNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorRampNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorSpillNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorSpillNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorToBWNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ColorToBWNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineHSVANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineHSVANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineRGBANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineRGBANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineYCCANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineYCCANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineYUVANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CombineYUVANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CompositorNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CompositorNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ConvertAlphaNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_CropNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_CropNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DefocusNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DefocusNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DifferenceMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DilateErodeNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DilateErodeNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DirectionalBlurNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DisplaceNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DisplaceNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DistanceMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DistanceMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_EllipseMaskNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_EllipseMaskNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_FilterNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_FilterNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_FlipNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_FlipNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_GammaNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_GammaNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_GlareNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_GlareNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_GroupNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_GroupNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_HueSaturationValueNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_IDMaskNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_IDMaskNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ImageNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ImageNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_InvertNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_InvertNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_LensDistortionNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_LensDistortionNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_LuminanceMatteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MapUVNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MapUVNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MapValueNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MapValueNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MathNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MathNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MixNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MixNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MovieClipNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MovieClipNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MovieDistortionNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MovieDistortionNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_MuteNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_MuteNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_NormalNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_NormalNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_NormalizeNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_NormalizeNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_OutputFileNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_OutputFileNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_RenderLayersNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_RenderLayersNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_RotateNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_RotateNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ScaleNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ScaleNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateHSVANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateHSVANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateRGBANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateRGBANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateYCCANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateYCCANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateYUVANode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SeparateYUVANode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SetAlphaNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SetAlphaNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SocketProxyNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SocketProxyNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SplitViewerNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SplitViewerNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_Stabilize2dNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_Stabilize2dNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_SwitchNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_SwitchNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_TextureNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_TextureNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_TimeNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_TimeNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_TonemapNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_TonemapNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_TransformNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_TransformNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_TranslateNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_TranslateNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ValueNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ValueNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_VectorBlurNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_VectorBlurNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_VectorCurveNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_VectorCurveNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ViewLevelsNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ViewLevelsNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ViewerNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ViewerNode.h [new file with mode: 0644]
source/blender/compositor/nodes/COM_ZCombineNode.cpp [new file with mode: 0644]
source/blender/compositor/nodes/COM_ZCombineNode.h [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverKeyOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverMixedOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverMixedOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_AntiAliasOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_AntiAliasOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BilateralBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BilateralBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BlurBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BlurBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BokehBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BokehBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BokehImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BokehImageOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BoxMaskOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BoxMaskOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_BrightnessOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_BrightnessOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CalculateMeanOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CalculateMeanOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ChangeHSVOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ChangeHSVOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ChannelMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ChannelMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ChromaMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ChromaMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorCorrectionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorCurveOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorCurveOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorRampOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorRampOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorSpillOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ColorSpillOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CombineChannelsOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CombineChannelsOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CompositorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CompositorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorProfileOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorToBWOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorToVectorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColorToVectorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertColourToValueProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertHSVToRGBOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertKeyToPremulOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertPremulToKeyOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToHSVOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertRGBToYUVOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertValueToColourProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertValueToColourProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertValueToVectorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertValueToVectorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertVectorToColorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertVectorToColorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertVectorToValueOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertVectorToValueOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvertYUVToRGBOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ConvolutionFilterOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CropOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CropOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_CurveBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_CurveBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DifferenceMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DilateErodeOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DilateErodeOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DirectionalBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DisplaceOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DisplaceOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DisplaceSimpleOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DisplaceSimpleOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DistanceMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DistanceMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DotproductOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DotproductOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_EllipseMaskOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_EllipseMaskOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_FastGaussianBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_FlipOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_FlipOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_FogGlowImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_FogGlowImageOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GammaCorrectOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GammaCorrectOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GammaOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GammaOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianXBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GaussianYBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareSimpleStarOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareStreaksOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareStreaksOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareThresholdOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_GlareThresholdOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_IDMaskOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_IDMaskOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ImageOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_InvertOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_InvertOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGhostOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGhostOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGlowImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGlowImageOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGlowOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_LensGlowOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_LuminanceMatteOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MapUVOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MapUVOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MapValueOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MapValueOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MathBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MathBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixAddOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixAddOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBlendOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBlendOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBurnOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixBurnOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixColorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixColorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDarkenOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDarkenOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDifferenceOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDifferenceOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDivideOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDivideOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDodgeOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixDodgeOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixHueOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixHueOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixLightenOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixLightenOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixLinearLightOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixLinearLightOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixMultiplyOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixMultiplyOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixOverlayOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixOverlayOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSaturationOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSaturationOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixScreenOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixScreenOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSoftLightOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSoftLightOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSubtractOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixSubtractOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MixValueOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MixValueOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieClipAttributeOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieClipOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieClipOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieDistortionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MovieDistortionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_MultilayerImageOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_MultilayerImageOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_NormalizeOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_NormalizeOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_OpenCLKernels.cl [new file with mode: 0644]
source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_OutputFileOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_OutputFileOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_PreviewOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_PreviewOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_QualityStepHelper.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_QualityStepHelper.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ReadBufferOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ReadBufferOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersAOOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersAOOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersAlphaProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersAlphaProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersBaseProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersBaseProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersColorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersColorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersCyclesOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersCyclesOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersDepthProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersDepthProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersDiffuseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersEmitOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersEmitOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersEnvironmentOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersImageProg.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersImageProg.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersIndirectOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersIndirectOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersMaterialIndexOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersMistOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersMistOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersNormalOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersNormalOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersObjectIndexOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersReflectionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersReflectionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersRefractionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersRefractionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersShadowOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersShadowOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersSpecularOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersSpecularOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersSpeedOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersSpeedOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersUVOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RenderLayersUVOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_RotateOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_RotateOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ScaleOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ScaleOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SeparateChannelOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SeparateChannelOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SetAlphaOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SetAlphaOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SetColorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SetColorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SetSamplerOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SetSamplerOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SetValueOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SetValueOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SetVectorOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SetVectorOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SocketProxyOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SocketProxyOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_SplitViewerOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_SplitViewerOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_TextureOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_TextureOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_TonemapOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_TonemapOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_TranslateOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_TranslateOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_VectorBlurOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_VectorBlurOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_VectorCurveOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_VectorCurveOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ViewerBaseOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ViewerOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ViewerOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_WriteBufferOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_WriteBufferOperation.h [new file with mode: 0644]
source/blender/compositor/operations/COM_ZCombineOperation.cpp [new file with mode: 0644]
source/blender/compositor/operations/COM_ZCombineOperation.h [new file with mode: 0644]
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_draw.c
source/blender/editors/animation/drivers.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/editarmature_retarget.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/armature/poseobject.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/editcurve.c
source/blender/editors/datafiles/blender_icons.png.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_node.h
source/blender/editors/include/ED_transform.h
source/blender/editors/include/UI_icons.h
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/resources.c
source/blender/editors/interface/view2d.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/render/render_internal.c
source/blender/editors/render/render_preview.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_hide.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_intern.h
source/blender/editors/sculpt_paint/paint_mask.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_console/console_ops.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_file/fsmenu.c
source/blender/editors/space_file/fsmenu.h
source/blender/editors/space_file/space_file.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_buttons.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_ops.c
source/blender/editors/space_node/node_select.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/editors/space_text/text_draw.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_fly.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_input.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_ops.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/editmode_undo.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_parametrizer.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/gpu/shaders/gpu_shader_material.glsl.c
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/imbuf/intern/anim_movie.c
source/blender/imbuf/intern/cineon/cineon_dpx.c
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
source/blender/imbuf/intern/filetype.c
source/blender/imbuf/intern/filter.c
source/blender/imbuf/intern/indexer.c
source/blender/imbuf/intern/indexer_dv.c
source/blender/imbuf/intern/jp2.c
source/blender/imbuf/intern/moviecache.c
source/blender/imbuf/intern/png.c
source/blender/imbuf/intern/radiance_hdr.c
source/blender/imbuf/intern/scaling.c
source/blender/imbuf/intern/targa.c
source/blender/imbuf/intern/tiff.c
source/blender/imbuf/intern/util.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_controller.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_remesh.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/modifiers/intern/MOD_skin.c [new file with mode: 0644]
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_util.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_composite.h
source/blender/nodes/NOD_shader.h
source/blender/nodes/SConscript
source/blender/nodes/composite/node_composite_tree.c
source/blender/nodes/composite/node_composite_util.c
source/blender/nodes/composite/nodes/node_composite_blur.c
source/blender/nodes/composite/nodes/node_composite_bokehblur.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_bokehimage.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_boxmask.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_colorcorrection.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_defocus.c
source/blender/nodes/composite/nodes/node_composite_ellipsemask.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/nodes/composite/nodes/node_composite_outputFile.c
source/blender/nodes/composite/nodes/node_composite_switch.c [new file with mode: 0644]
source/blender/nodes/composite/nodes/node_composite_viewer.c
source/blender/nodes/intern/node_common.c
source/blender/nodes/intern/node_exec.c
source/blender/nodes/intern/node_util.c
source/blender/nodes/shader/node_shader_util.c
source/blender/nodes/shader/nodes/node_shader_object_info.c [new file with mode: 0644]
source/blender/nodes/shader/nodes/node_shader_tex_environment.c
source/blender/nodes/shader/nodes/node_shader_tex_image.c
source/blender/opencl/CMakeLists.txt [new file with mode: 0644]
source/blender/opencl/OCL_opencl.h [new file with mode: 0644]
source/blender/opencl/SConscript [new file with mode: 0644]
source/blender/opencl/intern/OCL_opencl.c [new file with mode: 0644]
source/blender/opencl/intern/clew.c [new file with mode: 0644]
source/blender/opencl/intern/clew.h [new file with mode: 0644]
source/blender/python/bmesh/bmesh_py_types.c
source/blender/python/bmesh/bmesh_py_types_customdata.c
source/blender/python/generic/bpy_internal_import.c
source/blender/python/generic/idprop_py_api.c
source/blender/python/generic/py_capi_utils.c
source/blender/python/intern/bpy_driver.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_library.c
source/blender/python/intern/bpy_operator.c
source/blender/python/intern/bpy_props.c
source/blender/python/intern/bpy_rna.c
source/blender/python/mathutils/mathutils_Quaternion.c
source/blender/quicktime/apple/quicktime_export.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/initrender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/pixelshading.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/rendercore.c
source/blender/render/intern/source/renderdatabase.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/sss.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/intern/wm_draw.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_gesture.c
source/blender/windowmanager/intern/wm_jobs.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Converter/BL_MeshDeformer.cpp
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/Ketsji/BL_Action.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/SceneGraph/SG_Spatial.cpp

index 552cf77..5632d21 100644 (file)
@@ -103,8 +103,8 @@ enable_testing()
 #-----------------------------------------------------------------------------
 # Redirect output files
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
 
 #-----------------------------------------------------------------------------
 # Set default config options
@@ -238,8 +238,14 @@ mark_as_advanced(WITH_MINGW64)
 option(WITH_CYCLES                                     "Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST                                "Build cycles test application" OFF)
 option(WITH_CYCLES_CUDA_BINARIES       "Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH          sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
+       set(PLATFORM_DEFAULT sm_20 sm_21)
+else()
+       set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
+endif()
+set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -291,8 +297,9 @@ if(APPLE)
                        message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
                endif()
        else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
-               execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILDNR )
-               STRING(SUBSTRING ${XCODE_VERS_BUILDNR} 6 3 XCODE_VERSION) # truncate away build-nr
+               execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
+               string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
+               unset(XCODE_VERS_BUILD_NR)
        endif()
        
        message(STATUS "Detected Xcode-version: " ${XCODE_VERSION})
@@ -1186,13 +1193,13 @@ elseif(APPLE)
        endif()
 
        if(${XCODE_VERSION} VERSION_LESS 4.3)
-               SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+               set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
        else()
                # note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
                # absolute pathes are more foolproof here !
-               SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
-               SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
-               SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+               set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+               set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+               set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
        endif() 
        
        if(WITH_LIBS10.5)
@@ -1364,7 +1371,7 @@ elseif(APPLE)
                )
 
                set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-               set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
+               set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
                #pcre is bundled with openCollada
                #set(PCRE ${LIBDIR}/pcre)
                #set(PCRE_LIBPATH ${PCRE}/lib)
index 46ce989..bbf3dff 100644 (file)
@@ -553,7 +553,7 @@ if env['OURPLATFORM']!='darwin':
 
                 source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
                 # To ensure empty dirs are created too
-                if len(source)==0:
+                if len(source)==0 and not os.path.exists(dir):
                     env.Execute(Mkdir(dir))
                 scriptinstall.append(env.Install(dir=dir,source=source))
         if env['WITH_BF_CYCLES']:
index 5764155..dc83411 100644 (file)
@@ -169,6 +169,11 @@ BF_BOOST_LIBPATH = BF_BOOST + '/lib'
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+
 ##
 CC = 'gcc'
 CXX = 'g++'
index 5a06647..0c5d37f 100644 (file)
@@ -869,12 +869,17 @@ class BlenderEnvironment(SConsEnvironment):
             lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
         elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
             if lenv['WITH_BF_PYTHON']:
-                if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                if (not lenv['WITHOUT_BF_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
+                    not BlenderEnvironment.PyBundleActionAdded):
                     lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
                     BlenderEnvironment.PyBundleActionAdded = True
         elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
             if lenv['WITH_BF_PYTHON']:
-                if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                if (not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
+                    not BlenderEnvironment.PyBundleActionAdded):
                     lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
                     BlenderEnvironment.PyBundleActionAdded = True
         return prog
index 1ad0b88..d3a334b 100644 (file)
@@ -134,7 +134,7 @@ def validate_arguments(args, bc):
             'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
             'WITHOUT_BF_INSTALL',
-            'WITHOUT_BF_PYTHON_INSTALL',
+            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
             'WITHOUT_BF_OVERWRITE_INSTALL',
             'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
             'WITH_GHOST_COCOA',
@@ -519,6 +519,7 @@ def read_opts(env, cfg, args):
         (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
         (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
         (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+        (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
         (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
         (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
         (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
index 1ee5118..d30303f 100644 (file)
@@ -28,7 +28,7 @@ This example script prints the vertices and UV's for each polygon, assumes the a
 import bpy
 
 me = bpy.context.object.data
-uv_layer = me.uv.layers.active.data
+uv_layer = me.uv_layers.active.data
 
 for poly in me.polygons:
     print("Polygon index: %d, length: %d" % (poly.index, poly.loop_total))
index 212ab4e..a55bf71 100644 (file)
@@ -99,9 +99,11 @@ Here are some examples ...
    uv_lay = bm.loops.layers.uv.active
 
    for face in bm.faces:
-       for loop in f.loops:
-           uv = loop[uv_lay]
-           print("Loop UV: %f, %f" % (uv.x, uv.y))
+       for loop in face.loops:
+           uv = loop[uv_lay].uv
+           print("Loop UV: %f, %f" % uv[:])
+           vert = loop.vert
+           print("Loop Vert: (%f,%f,%f)" % vert.co[:])
 
 
 .. code-block:: python
index 641aa88..14d4c2f 100644 (file)
@@ -245,6 +245,7 @@ void BlenderSync::sync_object(BL::Object b_parent, int b_index, BL::Object b_ob,
        /* object sync */
        if(object_updated || (object->mesh && object->mesh->need_update)) {
                object->name = b_ob.name().c_str();
+               object->instance_id = b_index;
                object->pass_id = b_ob.pass_index();
                object->tfm = tfm;
                object->motion.pre = tfm;
@@ -284,52 +285,55 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
 
        /* object loop */
        BL::Scene::objects_iterator b_ob;
+       BL::Scene b_sce = b_scene;
 
-       for(b_scene.objects.begin(b_ob); b_ob != b_scene.objects.end(); ++b_ob) {
-               bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
-               uint ob_layer = get_layer(b_ob->layers());
+       for(; b_sce; b_sce = b_sce.background_set()) {
+               for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
+                       bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
+                       uint ob_layer = get_layer(b_ob->layers());
 
-               if(!hide && (ob_layer & scene_layer)) {
-                       if(b_ob->is_duplicator()) {
-                               /* dupli objects */
-                               object_create_duplilist(*b_ob, b_scene);
+                       if(!hide && (ob_layer & scene_layer)) {
+                               if(b_ob->is_duplicator()) {
+                                       /* dupli objects */
+                                       object_create_duplilist(*b_ob, b_scene);
 
-                               BL::Object::dupli_list_iterator b_dup;
-                               int b_index = 0;
+                                       BL::Object::dupli_list_iterator b_dup;
+                                       int b_index = 0;
 
-                               for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
-                                       Transform tfm = get_transform(b_dup->matrix());
-                                       BL::Object b_dup_ob = b_dup->object();
-                                       bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
+                                       for(b_ob->dupli_list.begin(b_dup); b_dup != b_ob->dupli_list.end(); ++b_dup) {
+                                               Transform tfm = get_transform(b_dup->matrix());
+                                               BL::Object b_dup_ob = b_dup->object();
+                                               bool dup_hide = (b_v3d)? b_dup_ob.hide(): b_dup_ob.hide_render();
 
-                                       if(!(b_dup->hide() || dup_hide))
-                                               sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion);
+                                               if(!(b_dup->hide() || dup_hide))
+                                                       sync_object(*b_ob, b_index, b_dup_ob, tfm, ob_layer, motion);
 
-                                       b_index++;
-                               }
-
-                               object_free_duplilist(*b_ob);
+                                               b_index++;
+                                       }
 
-                               hide = true;
-                       }
+                                       object_free_duplilist(*b_ob);
 
-                       /* check if we should render or hide particle emitter */
-                       BL::Object::particle_systems_iterator b_psys;
-                       bool render_emitter = false;
+                                       hide = true;
+                               }
 
-                       for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
-                               if(b_psys->settings().use_render_emitter()) {
-                                       hide = false;
-                                       render_emitter = true;
+                               /* check if we should render or hide particle emitter */
+                               BL::Object::particle_systems_iterator b_psys;
+                               bool render_emitter = false;
+
+                               for(b_ob->particle_systems.begin(b_psys); b_psys != b_ob->particle_systems.end(); ++b_psys) {
+                                       if(b_psys->settings().use_render_emitter()) {
+                                               hide = false;
+                                               render_emitter = true;
+                                       }
+                                       else if(!render_emitter)
+                                               hide = true;
                                }
-                               else if(!render_emitter)
-                                       hide = true;
-                       }
 
-                       if(!hide) {
-                               /* object itself */
-                               Transform tfm = get_transform(b_ob->matrix_world());
-                               sync_object(*b_ob, 0, *b_ob, tfm, ob_layer, motion);
+                               if(!hide) {
+                                       /* object itself */
+                                       Transform tfm = get_transform(b_ob->matrix_world());
+                                       sync_object(*b_ob, 0, *b_ob, tfm, ob_layer, motion);
+                               }
                        }
                }
        }
index f79b999..997909f 100644 (file)
@@ -220,6 +220,7 @@ void BlenderSession::render()
                buffer_params.passes = passes;
                scene->film->passes = passes;
                scene->film->tag_update(scene);
+               scene->integrator->tag_update(scene);
 
                /* update scene */
                sync->sync_data(b_v3d, b_engine.camera_override(), b_iter->name().c_str());
index b33de78..59eeb25 100644 (file)
@@ -334,6 +334,10 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Shader
                        node = new LightFalloffNode();
                        break;
                }
+               case BL::ShaderNode::type_OBJECT_INFO: {
+                       node = new ObjectInfoNode();
+                       break;
+               }
                case BL::ShaderNode::type_TEX_IMAGE: {
                        BL::ShaderNodeTexImage b_image_node(b_node);
                        BL::Image b_image(b_image_node.image());
index abe427d..05c45c4 100644 (file)
@@ -117,6 +117,16 @@ __device_inline void object_dir_transform(KernelGlobals *kg, ShaderData *sd, flo
 #endif
 }
 
+__device_inline float3 object_location(KernelGlobals *kg, ShaderData *sd)
+{
+#ifdef __MOTION__
+       return make_float3(sd->ob_tfm.x.w, sd->ob_tfm.y.w, sd->ob_tfm.z.w);
+#else
+       Transform tfm = object_fetch_transform(kg, sd->object, 0.0f, OBJECT_TRANSFORM);
+       return make_float3(tfm.x.w, tfm.y.w, tfm.z.w);
+#endif
+}
+
 __device_inline float object_surface_area(KernelGlobals *kg, int object)
 {
        int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
@@ -134,5 +144,20 @@ __device_inline float object_pass_id(KernelGlobals *kg, int object)
        return f.y;
 }
 
+__device_inline float object_random_number(KernelGlobals *kg, int object)
+{
+       if(object == ~0)
+               return 0.0f;
+
+       int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
+       float4 f = kernel_tex_fetch(__objects, offset);
+       return f.z;
+}
+
+__device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
+{
+       return kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2 + 1);
+}
+
 CCL_NAMESPACE_END
 
index 2138038..8e0d367 100644 (file)
@@ -679,11 +679,6 @@ __device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect)
 }
 #endif
 
-__device int shader_pass_id(KernelGlobals *kg, ShaderData *sd)
-{
-       return kernel_tex_fetch(__shader_flag, (sd->shader & SHADER_MASK)*2 + 1);
-}
-
 /* Free ShaderData */
 
 __device void shader_release(KernelGlobals *kg, ShaderData *sd)
index 12ed616..6a05639 100644 (file)
@@ -266,6 +266,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
                        case NODE_LIGHT_PATH:
                                svm_node_light_path(sd, stack, node.y, node.z, path_flag);
                                break;
+                       case NODE_OBJECT_INFO:
+                               svm_node_object_info(kg, sd, stack, node.y, node.z);
+                               break;
 #endif
                        case NODE_CONVERT:
                                svm_node_convert(sd, stack, node.y, node.z, node.w);
index 77fe26c..dab1998 100644 (file)
@@ -74,5 +74,25 @@ __device void svm_node_geometry_bump_dy(ShaderData *sd, float *stack, uint type,
 #endif
 }
 
+/* Object Info */
+
+__device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float *stack, uint type, uint out_offset)
+{
+       float data;
+
+       switch(type) {
+               case NODE_INFO_OB_LOCATION: {
+                       stack_store_float3(stack, out_offset, object_location(kg, sd));
+                       return;
+               }
+               case NODE_INFO_OB_INDEX: data = object_pass_id(kg, sd->object); break;
+               case NODE_INFO_MAT_INDEX: data = shader_pass_id(kg, sd); break;
+               case NODE_INFO_OB_RANDOM: data = object_random_number(kg, sd->object); break;
+               default: data = 0.0f; break;
+       }
+
+       stack_store_float(stack, out_offset, data);
+}
+
 CCL_NAMESPACE_END
 
index aa924bc..9952557 100644 (file)
@@ -87,7 +87,7 @@ __device void svm_node_tex_coord(KernelGlobals *kg, ShaderData *sd, float *stack
                }
                case NODE_TEXCO_REFLECTION: {
                        if(sd->object != ~0)
-                               data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+                               data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
                        else
                                data = sd->I;
                        break;
@@ -136,7 +136,7 @@ __device void svm_node_tex_coord_bump_dx(KernelGlobals *kg, ShaderData *sd, floa
                }
                case NODE_TEXCO_REFLECTION: {
                        if(sd->object != ~0)
-                               data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+                               data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
                        else
                                data = sd->I;
                        break;
@@ -188,7 +188,7 @@ __device void svm_node_tex_coord_bump_dy(KernelGlobals *kg, ShaderData *sd, floa
                }
                case NODE_TEXCO_REFLECTION: {
                        if(sd->object != ~0)
-                               data = sd->I - 2.0f*dot(sd->N, sd->I)*sd->N;
+                               data = 2.0f*dot(sd->N, sd->I)*sd->N - sd->I;
                        else
                                data = sd->I;
                        break;
index 867709f..9784973 100644 (file)
@@ -92,7 +92,8 @@ typedef enum NodeType {
        NODE_RGB_RAMP = 5900,
        NODE_RGB_CURVES = 6000,
        NODE_MIN_MAX = 6100,
-       NODE_LIGHT_FALLOFF = 6200
+       NODE_LIGHT_FALLOFF = 6200,
+       NODE_OBJECT_INFO = 6300
 } NodeType;
 
 typedef enum NodeAttributeType {
@@ -109,6 +110,13 @@ typedef enum NodeGeometry {
        NODE_GEOM_uv
 } NodeGeometry;
 
+typedef enum NodeObjectInfo {
+       NODE_INFO_OB_LOCATION,
+       NODE_INFO_OB_INDEX,
+       NODE_INFO_MAT_INDEX,
+       NODE_INFO_OB_RANDOM
+} NodeObjectInfo;
+
 typedef enum NodeLightPath {
        NODE_LP_camera = 0,
        NODE_LP_shadow,
index 55c89b7..878aa87 100644 (file)
@@ -298,7 +298,6 @@ bool Film::modified(const Film& film)
 
 void Film::tag_update(Scene *scene)
 {
-       scene->integrator->tag_update(scene);
        need_update = true;
 }
 
index d9486de..77bc9cf 100644 (file)
@@ -325,6 +325,25 @@ void ShaderGraph::remove_proxy_nodes(vector<bool>& removed)
                        
                        removed[proxy->id] = true;
                }
+
+               /* remove useless mix closures nodes */
+               MixClosureNode *mix = dynamic_cast<MixClosureNode*>(node);
+
+               if(mix) {
+                       if(mix->outputs[0]->links.size() && mix->inputs[1]->link == mix->inputs[2]->link) {
+                               ShaderOutput *output = mix->inputs[1]->link;
+                               vector<ShaderInput*> inputs = mix->outputs[0]->links;
+
+                               foreach(ShaderInput *sock, mix->inputs)
+                                       if(sock->link)
+                                               disconnect(sock);
+
+                               foreach(ShaderInput *input, inputs) {
+                                       disconnect(input);
+                                       connect(output, input);
+                               }
+                       }
+               }
        }
 }
 
index 57fe2fb..506458d 100644 (file)
@@ -1699,7 +1699,7 @@ void LightPathNode::compile(OSLCompiler& compiler)
        compiler.add(this, "node_light_path");
 }
 
-/* Light Path */
+/* Light Falloff */
 
 LightFalloffNode::LightFalloffNode()
 : ShaderNode("light_path")
@@ -1746,6 +1746,49 @@ void LightFalloffNode::compile(OSLCompiler& compiler)
        compiler.add(this, "node_light_falloff");
 }
 
+/* Object Info */
+
+ObjectInfoNode::ObjectInfoNode()
+: ShaderNode("object_info")
+{
+       add_output("Location", SHADER_SOCKET_VECTOR);
+       add_output("Object Index", SHADER_SOCKET_FLOAT);
+       add_output("Material Index", SHADER_SOCKET_FLOAT);
+       add_output("Random", SHADER_SOCKET_FLOAT);
+}
+
+void ObjectInfoNode::compile(SVMCompiler& compiler)
+{
+       ShaderOutput *out = output("Location");
+       if(!out->links.empty()) {
+               compiler.stack_assign(out);
+               compiler.add_node(NODE_OBJECT_INFO, NODE_INFO_OB_LOCATION, out->stack_offset);
+       }
+
+       out = output("Object Index");
+       if(!out->links.empty()) {
+               compiler.stack_assign(out);
+               compiler.add_node(NODE_OBJECT_INFO, NODE_INFO_OB_INDEX, out->stack_offset);
+       }
+
+       out = output("Material Index");
+       if(!out->links.empty()) {
+               compiler.stack_assign(out);
+               compiler.add_node(NODE_OBJECT_INFO, NODE_INFO_MAT_INDEX, out->stack_offset);
+       }
+
+       out = output("Random");
+       if(!out->links.empty()) {
+               compiler.stack_assign(out);
+               compiler.add_node(NODE_OBJECT_INFO, NODE_INFO_OB_RANDOM, out->stack_offset);
+       }
+}
+
+void ObjectInfoNode::compile(OSLCompiler& compiler)
+{
+       compiler.add(this, "node_object_info");
+}
+
 /* Value */
 
 ValueNode::ValueNode()
index ff9e364..2d0d58d 100644 (file)
@@ -285,6 +285,11 @@ public:
        SHADER_NODE_CLASS(LightFalloffNode)
 };
 
+class ObjectInfoNode : public ShaderNode {
+public:
+       SHADER_NODE_CLASS(ObjectInfoNode)
+};
+
 class ValueNode : public ShaderNode {
 public:
        SHADER_NODE_CLASS(ValueNode)
index cae69c0..e38b263 100644 (file)
@@ -23,6 +23,7 @@
 #include "scene.h"
 
 #include "util_foreach.h"
+#include "util_hash.h"
 #include "util_map.h"
 #include "util_progress.h"
 
@@ -36,6 +37,7 @@ Object::Object()
        mesh = NULL;
        tfm = transform_identity();
        visibility = ~0;
+       instance_id = 0;
        pass_id = 0;
        bounds = BoundBox::empty;
        motion.pre = transform_identity();
@@ -164,6 +166,9 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
                float surface_area = 0.0f;
                float pass_id = ob->pass_id;
                
+               uint ob_hash = hash_int_2d(hash_string(ob->name.c_str()), ob->instance_id);
+               float random_number = (float)ob_hash * (1.0f/(float)0xFFFFFFFF);
+               
                if(transform_uniform_scale(tfm, uniform_scale)) {
                        map<Mesh*, float>::iterator it = surface_area_map.find(mesh);
 
@@ -198,7 +203,7 @@ void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene
 
                memcpy(&objects[offset], &tfm, sizeof(float4)*3);
                memcpy(&objects[offset+3], &itfm, sizeof(float4)*3);
-               objects[offset+6] = make_float4(surface_area, pass_id, 0.0f, 0.0f);
+               objects[offset+6] = make_float4(surface_area, pass_id, random_number, 0.0f);
 
                if(need_motion == Scene::MOTION_PASS) {
                        /* motion transformations, is world/object space depending if mesh
index 267052b..b8169e3 100644 (file)
@@ -41,6 +41,7 @@ public:
        Transform tfm;
        BoundBox bounds;
        ustring name;
+       int instance_id;
        int pass_id;
        vector<ParamValue> attributes;
        uint visibility;
index 16901da..c31b46e 100644 (file)
 #ifndef __UTIL_HASH_H__
 #define __UTIL_HASH_H__
 
+#include "util_types.h"
+
 CCL_NAMESPACE_BEGIN
 
-static inline unsigned int hash_int_2d(unsigned int kx, unsigned int ky)
+static inline uint hash_int_2d(uint kx, uint ky)
 {
        #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
 
-       unsigned int a, b, c;
+       uint a, b, c;
 
        a = b = c = 0xdeadbeef + (2 << 2) + 13;
        a += kx;
@@ -44,11 +46,21 @@ static inline unsigned int hash_int_2d(unsigned int kx, unsigned int ky)
        #undef rot
 }
 
-static inline unsigned int hash_int(unsigned int k)
+static inline uint hash_int(uint k)
 {
        return hash_int_2d(k, 0);
 }
 
+static inline uint hash_string(const char *str)
+{
+       uint i = 0, c;
+
+       while ((c = *str++))
+               i = i * 37 + c;
+
+       return i;
+}
+
 CCL_NAMESPACE_END
 
 #endif /* __UTIL_HASH_H__ */
index 064269b..e9d2956 100644 (file)
@@ -86,9 +86,12 @@ set(SRC
        intern/solver_interface.h
        intern/solver_relax.h
        intern/utilities.h
-    intern/globals.h
+       intern/globals.h
 )
 
+# elbeem has some harmless UNUSED warnings
+remove_strict_flags()
+
 add_definitions(
        -DNOGUI
        -DELBEEM_BLENDER=1
index 3add5cc..7f33f2b 100644 (file)
@@ -30,7 +30,7 @@
  * \brief GHOST C-API function and type declarations.
  */
 
-#ifndef        __GHOST_C_API_H__
+#ifndef __GHOST_C_API_H__
 #define __GHOST_C_API_H__
 
 #include "GHOST_Types.h"
@@ -113,10 +113,10 @@ extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle);
  * @return A timer task (0 if timer task installation failed).
  */
 extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
-                                                                                               GHOST_TUns64 delay,
-                                                                                               GHOST_TUns64 interval,
-                                                                                               GHOST_TimerProcPtr timerProc,
-                                                                                               GHOST_TUserDataPtr userData);
+                                                GHOST_TUns64 delay,
+                                                GHOST_TUns64 interval,
+                                                GHOST_TimerProcPtr timerProc,
+                                                GHOST_TUserDataPtr userData);
 
 /**
  * Removes a timer.
@@ -125,11 +125,11 @@ extern GHOST_TimerTaskHandle GHOST_InstallTimer(GHOST_SystemHandle systemhandle,
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_RemoveTimer(GHOST_SystemHandle systemhandle,
-                                                                               GHOST_TimerTaskHandle timertaskhandle);
+                                        GHOST_TimerTaskHandle timertaskhandle);
 
 /***************************************************************************************
- ** Display/window management functionality
- ***************************************************************************************/
+** Display/window management functionality
+***************************************************************************************/
 
 /**
  * Returns the number of displays on this system.
@@ -146,8 +146,8 @@ extern GHOST_TUns8 GHOST_GetNumDisplays(GHOST_SystemHandle systemhandle);
  * @return void.
  */
 extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
-                                                                                  GHOST_TUns32* width,
-                                                                                  GHOST_TUns32* height);
+                                           GHOST_TUns32 *width,
+                                           GHOST_TUns32 *height);
 
 /**
  * Create a new window.
@@ -166,15 +166,15 @@ extern void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
  * @return     A handle to the new window ( == NULL if creation failed).
  */
 extern GHOST_WindowHandle GHOST_CreateWindow(GHOST_SystemHandle systemhandle,
-       const char* title,
-       GHOST_TInt32 left,
-       GHOST_TInt32 top,
-       GHOST_TUns32 width,
-       GHOST_TUns32 height,
-       GHOST_TWindowState state,
-       GHOST_TDrawingContextType type,
-       const int stereoVisual,
-       const GHOST_TUns16 numOfAASamples);
+                                             const char *title,
+                                             GHOST_TInt32 left,
+                                             GHOST_TInt32 top,
+                                             GHOST_TUns32 width,
+                                             GHOST_TUns32 height,
+                                             GHOST_TWindowState state,
+                                             GHOST_TDrawingContextType type,
+                                             const int stereoVisual,
+                                             const GHOST_TUns16 numOfAASamples);
 
 /**
  * Returns the window user data.
@@ -189,7 +189,7 @@ extern GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandl
  * @param data The window user data.
  */
 extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, 
-       GHOST_TUserDataPtr userdata);
+                                    GHOST_TUserDataPtr userdata);
 
 /**
  * Dispose a window.
@@ -198,7 +198,7 @@ extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle,
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
-                                                                                 GHOST_WindowHandle windowhandle);
+                                          GHOST_WindowHandle windowhandle);
 
 /**
  * Returns whether a window is valid.
@@ -207,7 +207,7 @@ extern GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
  * @return     Indication of validity.
  */
 extern int GHOST_ValidWindow(GHOST_SystemHandle systemhandle,
-                                                                               GHOST_WindowHandle windowhandle);
+                             GHOST_WindowHandle windowhandle);
 
 /**
  * Begins full screen mode.
@@ -217,8 +217,8 @@ extern int GHOST_ValidWindow(GHOST_SystemHandle systemhandle,
  *                                     This window is invalid after full screen has been ended.
  */
 extern GHOST_WindowHandle GHOST_BeginFullScreen(GHOST_SystemHandle systemhandle,
-       GHOST_DisplaySetting* setting,
-       const int stereoVisual);
+                                                GHOST_DisplaySetting *setting,
+                                                const int stereoVisual);
 
 /**
  * Ends full screen mode.
@@ -235,8 +235,8 @@ extern GHOST_TSuccess GHOST_EndFullScreen(GHOST_SystemHandle systemhandle);
 extern int GHOST_GetFullScreen(GHOST_SystemHandle systemhandle);
 
 /***************************************************************************************
- ** Event management functionality
- ***************************************************************************************/
+** Event management functionality
+***************************************************************************************/
 
 /**
  * Retrieves events from the system and stores them in the queue.
@@ -261,7 +261,7 @@ extern int GHOST_DispatchEvents(GHOST_SystemHandle systemhandle);
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle,
-                                                                                         GHOST_EventConsumerHandle consumerhandle);
+                                             GHOST_EventConsumerHandle consumerhandle);
 
 /**
  * Remove the given event consumer to our list.
@@ -270,11 +270,11 @@ extern GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle,
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_RemoveEventConsumer(GHOST_SystemHandle systemhandle,
-                                                                                         GHOST_EventConsumerHandle consumerhandle);
+                                                GHOST_EventConsumerHandle consumerhandle);
 
 /***************************************************************************************
- ** Progress bar functionality
- ***************************************************************************************/
+** Progress bar functionality
+***************************************************************************************/
 
 /**
  * Sets the progress bar value displayed in the window/application icon
@@ -290,8 +290,8 @@ extern GHOST_TSuccess GHOST_SetProgressBar(GHOST_WindowHandle windowhandle, floa
 extern GHOST_TSuccess GHOST_EndProgressBar(GHOST_WindowHandle windowhandle);
 
 /***************************************************************************************
- ** Cursor management functionality
- ***************************************************************************************/
+** Cursor management functionality
+***************************************************************************************/
 
 /**
  * Returns the current cursor shape.
@@ -307,7 +307,7 @@ extern GHOST_TStandardCursor GHOST_GetCursorShape(GHOST_WindowHandle windowhandl
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorShape(GHOST_WindowHandle windowhandle,
-                                                                                  GHOST_TStandardCursor cursorshape);
+                                           GHOST_TStandardCursor cursorshape);
 
 /**
  * Set the shape of the cursor to a custom cursor.
@@ -319,10 +319,10 @@ extern GHOST_TSuccess GHOST_SetCursorShape(GHOST_WindowHandle windowhandle,
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle,
-                                                                                                GHOST_TUns8 bitmap[16][2], 
-                                                                                                GHOST_TUns8 mask[16][2], 
-                                                                                                int hotX, 
-                                                                                                int hotY);
+                                                 GHOST_TUns8 bitmap[16][2],
+                                                 GHOST_TUns8 mask[16][2],
+                                                 int hotX,
+                                                 int hotY);
 /**
  * Set the shape of the cursor to a custom cursor of specified size.
  * @param windowhandle The handle to the window
@@ -333,13 +333,13 @@ extern GHOST_TSuccess GHOST_SetCustomCursorShape(GHOST_WindowHandle windowhandle
  * @param      hotY    The Y coordinate of the cursor hotspot.
  * @param   fg_color, bg_color  Colors of the cursor
  * @return     Indication of success.
 */
+ */
 extern GHOST_TSuccess GHOST_SetCustomCursorShapeEx(GHOST_WindowHandle windowhandle,
-                                                                                                GHOST_TUns8 *bitmap, 
-                                                                                                GHOST_TUns8 *mask, 
-                                                                                                int sizex, int sizey, 
-                                                                                                int hotX,  int hotY,
-                                                                                                int fg_color, int bg_color );
+                                                   GHOST_TUns8 *bitmap,
+                                                   GHOST_TUns8 *mask,
+                                                   int sizex, int sizey,
+                                                   int hotX,  int hotY,
+                                                   int fg_color, int bg_color);
 
 /**
  * Returns the visibility state of the cursor.
@@ -355,7 +355,7 @@ extern int GHOST_GetCursorVisibility(GHOST_WindowHandle windowhandle);
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle,
-                                                                                               int visible);
+                                                int visible);
 
 /**
  * Returns the current location of the cursor (location in screen coordinates)
@@ -365,8 +365,8 @@ extern GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle,
  * @return                     Indication of success.
  */
 extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
-                                                                                         GHOST_TInt32* x,
-                                                                                         GHOST_TInt32* y);
+                                              GHOST_TInt32 *x,
+                                              GHOST_TInt32 *y);
 
 /**
  * Updates the location of the cursor (location in screen coordinates).
@@ -377,8 +377,8 @@ extern GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
  * @return                     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
-                                                                                         GHOST_TInt32 x,
-                                                                                         GHOST_TInt32 y);
+                                              GHOST_TInt32 x,
+                                              GHOST_TInt32 y);
 
 /**
  * Grabs the cursor for a modal operation, to keep receiving
@@ -390,12 +390,12 @@ extern GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
-                                                                                               GHOST_TGrabCursorMode mode,
-                                                                                               int* bounds);
+                                          GHOST_TGrabCursorMode mode,
+                                          int *bounds);
 
 /***************************************************************************************
- ** Access to mouse button and keyboard states.
- ***************************************************************************************/
+** Access to mouse button and keyboard states.
+***************************************************************************************/
 
 /**
  * Returns the state of a modifier key (ouside the message queue).
@@ -405,8 +405,8 @@ extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
  * @return                     Indication of success.
  */
 extern GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
-                                                                                               GHOST_TModifierKeyMask mask,
-                                                                                               int* isDown);
+                                                GHOST_TModifierKeyMask mask,
+                                                int *isDown);
 
 /**
  * Returns the state of a mouse button (ouside the message queue).
@@ -416,13 +416,13 @@ extern GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
  * @return                     Indication of success.
  */
 extern GHOST_TSuccess GHOST_GetButtonState(GHOST_SystemHandle systemhandle,
-                                                                                  GHOST_TButtonMask mask,
-                                                                                  int* isDown);
+                                           GHOST_TButtonMask mask,
+                                           int *isDown);
 
 
 /***************************************************************************************
- ** Drag'n'drop operations
- ***************************************************************************************/
+** Drag'n'drop operations
+***************************************************************************************/
 
 /**
  * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
@@ -472,7 +472,7 @@ extern GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhand
  * @param timerProc The timer callback.
  */
 extern void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
-                                                          GHOST_TimerProcPtr timerProc);
+                               GHOST_TimerProcPtr timerProc);
 
 /**
  * Returns the timer user data.
@@ -487,7 +487,7 @@ extern GHOST_TUserDataPtr GHOST_GetTimerTaskUserData(GHOST_TimerTaskHandle timer
  * @param data The timer user data.
  */
 extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle,
-                                                                          GHOST_TUserDataPtr userData);
+                                       GHOST_TUserDataPtr userData);
 
 /**
  * Returns indication as to whether the window is valid.
@@ -510,7 +510,7 @@ extern GHOST_TDrawingContextType GHOST_GetDrawingContextType(GHOST_WindowHandle
  * @return Indication as to whether installation has succeeded.
  */
 extern GHOST_TSuccess GHOST_SetDrawingContextType(GHOST_WindowHandle windowhandle,
-                                                                                                 GHOST_TDrawingContextType type);
+                                                  GHOST_TDrawingContextType type);
 
 /**
  * Sets the title displayed in the title bar.
@@ -518,7 +518,7 @@ extern GHOST_TSuccess GHOST_SetDrawingContextType(GHOST_WindowHandle windowhandl
  * @param title        The title to display in the title bar.
  */
 extern void GHOST_SetTitle(GHOST_WindowHandle windowhandle,
-                                                  const char* title);
+                           const char *title);
 
 /**
  * Returns the title displayed in the title bar. The title
@@ -527,7 +527,7 @@ extern void GHOST_SetTitle(GHOST_WindowHandle windowhandle,
  * @param windowhandle The handle to the window
  * @return The title, free with free().
  */
-extern charGHOST_GetTitle(GHOST_WindowHandle windowhandle);
+extern char *GHOST_GetTitle(GHOST_WindowHandle windowhandle);
 
 /**
  * Returns the window rectangle dimensions.
@@ -558,7 +558,7 @@ void GHOST_DisposeRectangle(GHOST_RectangleHandle rectanglehandle);
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle,
-                                                                                  GHOST_TUns32 width);
+                                           GHOST_TUns32 width);
 
 /**
  * Resizes client rectangle height.
@@ -567,7 +567,7 @@ extern GHOST_TSuccess GHOST_SetClientWidth(GHOST_WindowHandle windowhandle,
  * @return     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle,
-                                                                                       GHOST_TUns32 height);
+                                            GHOST_TUns32 height);
 
 /**
  * Resizes client rectangle.
@@ -577,8 +577,8 @@ extern GHOST_TSuccess GHOST_SetClientHeight(GHOST_WindowHandle windowhandle,
  * @return                     Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
-                                                                                 GHOST_TUns32 width,
-                                                                                 GHOST_TUns32 height);
+                                          GHOST_TUns32 width,
+                                          GHOST_TUns32 height);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
@@ -589,10 +589,10 @@ extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
  * @param outY The y-coordinate in the client rectangle.
  */
 extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
-                                                                GHOST_TInt32 inX,
-                                                                GHOST_TInt32 inY,
-                                                                GHOST_TInt32* outX,
-                                                                GHOST_TInt32* outY);
+                                 GHOST_TInt32 inX,
+                                 GHOST_TInt32 inY,
+                                 GHOST_TInt32 *outX,
+                                 GHOST_TInt32 *outY);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
@@ -603,10 +603,10 @@ extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
  * @param outY The y-coordinate on the screen.
  */
 extern void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
-                                                                GHOST_TInt32 inX,
-                                                                GHOST_TInt32 inY,
-                                                                GHOST_TInt32* outX,
-                                                                GHOST_TInt32* outY);
+                                 GHOST_TInt32 inX,
+                                 GHOST_TInt32 inY,
+                                 GHOST_TInt32 *outX,
+                                 GHOST_TInt32 *outY);
 
 /**
  * Returns the state of the window (normal, minimized, maximized).
@@ -622,7 +622,7 @@ extern GHOST_TWindowState GHOST_GetWindowState(GHOST_WindowHandle windowhandle);
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
-                                                                                  GHOST_TWindowState state);
+                                           GHOST_TWindowState state);
 
        
 /**
@@ -632,7 +632,7 @@ extern GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
-                                                                                                  GHOST_TUns8 isUnsavedChanges);
+                                                   GHOST_TUns8 isUnsavedChanges);
        
 /**
  * Sets the order of the window (bottom, top).
@@ -641,7 +641,7 @@ extern GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhand
  * @return Indication of success.
  */
 extern GHOST_TSuccess GHOST_SetWindowOrder(GHOST_WindowHandle windowhandle,
-                                                                                  GHOST_TWindowOrder order);
+                                           GHOST_TWindowOrder order);
 
 /**
  * Swaps front and back buffers of a window.
@@ -694,10 +694,10 @@ extern GHOST_TInt32 GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehand
  * @param      b       Pointer to return bottom coordinate in.
  */
 extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                          GHOST_TInt32* l,
-                                                          GHOST_TInt32* t,
-                                                          GHOST_TInt32* r,
-                                                          GHOST_TInt32* b);
+                               GHOST_TInt32 *l,
+                               GHOST_TInt32 *t,
+                               GHOST_TInt32 *r,
+                               GHOST_TInt32 *b);
 
 /**
  * Sets all members of the rectangle.
@@ -708,10 +708,10 @@ extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
  * @param      b       requested bottom coordinate of the rectangle
  */
 extern void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                          GHOST_TInt32 l,
-                                                          GHOST_TInt32 t,
-                                                          GHOST_TInt32 r,
-                                                          GHOST_TInt32 b);
+                               GHOST_TInt32 l,
+                               GHOST_TInt32 t,
+                               GHOST_TInt32 r,
+                               GHOST_TInt32 b);
 
 /**
  * Returns whether this rectangle is empty.
@@ -736,7 +736,7 @@ extern GHOST_TSuccess GHOST_IsValidRectangle(GHOST_RectangleHandle rectanglehand
  * @param      i       The amount of offset given to each extreme (negative values shrink the rectangle).
  */
 extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                GHOST_TInt32 i);
+                                 GHOST_TInt32 i);
 
 /**
  * Does a union of the rectangle given and this rectangle.
@@ -745,7 +745,7 @@ extern void GHOST_InsetRectangle(GHOST_RectangleHandle rectanglehandle,
  * @param      r       The rectangle that is input for the union operation.
  */
 extern void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                GHOST_RectangleHandle anotherrectanglehandle);
+                                 GHOST_RectangleHandle anotherrectanglehandle);
 
 /**
  * Grows the rectangle to included a point.
@@ -754,8 +754,8 @@ extern void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
  * @param      y       The y-coordinate of the point.
  */
 extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                         GHOST_TInt32 x,
-                                                                         GHOST_TInt32 y);
+                                      GHOST_TInt32 x,
+                                      GHOST_TInt32 y);
 
 /**
  * Returns whether the point is inside this rectangle.
@@ -766,8 +766,8 @@ extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
  * @return intean value (true if point is inside).
  */
 extern GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                                         GHOST_TInt32 x,
-                                                                                         GHOST_TInt32 y);
+                                              GHOST_TInt32 x,
+                                              GHOST_TInt32 y);
 
 /**
  * Returns whether the rectangle is inside this rectangle.
@@ -776,7 +776,7 @@ extern GHOST_TSuccess GHOST_IsInsideRectangle(GHOST_RectangleHandle rectanglehan
  * @return     visibility (not, partially or fully visible).
  */
 extern GHOST_TVisibility GHOST_GetRectangleVisibility(GHOST_RectangleHandle rectanglehandle,
-                                                                                                         GHOST_RectangleHandle anotherrectanglehandle);
+                                                      GHOST_RectangleHandle anotherrectanglehandle);
 
 /**
  * Sets rectangle members.
@@ -786,8 +786,8 @@ extern GHOST_TVisibility GHOST_GetRectangleVisibility(GHOST_RectangleHandle rect
  * @param      cy      requested center y-coordinate of the rectangle
  */
 extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                        GHOST_TInt32 cx,
-                                                                        GHOST_TInt32 cy);
+                                     GHOST_TInt32 cx,
+                                     GHOST_TInt32 cy);
 
 /**
  * Sets rectangle members.
@@ -800,10 +800,10 @@ extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
  * @param      h       requested height of the rectangle
  */
 extern void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
-                                                                        GHOST_TInt32 cx,
-                                                                        GHOST_TInt32 cy,
-                                                                        GHOST_TInt32 w,
-                                                                        GHOST_TInt32 h);
+                                     GHOST_TInt32 cx,
+                                     GHOST_TInt32 cy,
+                                     GHOST_TInt32 w,
+                                     GHOST_TInt32 h);
 
 /**
  * Clips a rectangle.
@@ -814,14 +814,14 @@ extern void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
  * @return     whether clipping has occurred
  */
 extern GHOST_TSuccess GHOST_ClipRectangle(GHOST_RectangleHandle rectanglehandle,
-                                                                                 GHOST_RectangleHandle anotherrectanglehandle);
+                                          GHOST_RectangleHandle anotherrectanglehandle);
 
 /**
  * Return the data from the clipboad
  * @param      return the selection instead, X11 only feature
  * @return     clipboard data
  */
-extern GHOST_TUns8GHOST_getClipboard(int selection);
+extern GHOST_TUns8 *GHOST_getClipboard(int selection);
 
 /**
  * Put data to the Clipboard
index 05bd355..3c3111a 100644 (file)
@@ -77,7 +77,7 @@ public:
         * or NULL if it is a 'system' event.
         * @return The generating window.
         */
-       virtual GHOST_IWindowgetWindow() = 0;
+       virtual GHOST_IWindow *getWindow() = 0;
        
        /**
         * Returns the event data.
@@ -87,8 +87,12 @@ public:
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       void *operator new(size_t num_bytes) {
+               return MEM_mallocN(num_bytes, "GHOST:GHOST_IEvent");
+       }
+       void operator delete(void *mem) {
+               MEM_freeN(mem);
+       }
 #endif
 };
 
index 043cb27..d437f21 100644 (file)
@@ -61,7 +61,7 @@ public:
         * @param       event   The event that can be handled or ignored.
         * @return      Indication as to whether the event was handled.
         */
-       virtual bool processEvent(GHOST_IEventevent) = 0;
+       virtual bool processEvent(GHOST_IEvent *event) = 0;
        
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
index 890917f..bd4f3ae 100644 (file)
@@ -129,12 +129,12 @@ class GHOST_IEventConsumer;
  * There should be only one system class in an application.
  * Therefore, the routines to create and dispose the system are static.
  * Provides:
- *     -# Time(r) management.
- *     -# Display/window management (windows are only created on the main display).
- *     -# Event management.
- *     -# Cursor shape management (no custom cursors for now).
- *     -# Access to the state of the mouse buttons and the keyboard.
- *     -# Menus for windows with events generated when they are accessed (this is
+ *  -# Time(r) management.
+ *  -# Display/window management (windows are only created on the main display).
+ *  -# Event management.
+ *  -# Cursor shape management (no custom cursors for now).
+ *  -# Access to the state of the mouse buttons and the keyboard.
+ *  -# Menus for windows with events generated when they are accessed (this is
  *     work in progress).
  * @author     Maarten Gribnau
  * @date       May 30, 2001
@@ -158,25 +158,27 @@ public:
         * Returns a pointer to the one and only system (nil if it hasn't been created).
         * @return A pointer to the system.
         */
-       static GHOST_ISystemgetSystem();
+       static GHOST_ISystem *getSystem();
 
 protected:
        /**
         * Constructor.
         * Protected default constructor to force use of static createSystem member.
         */
-       GHOST_ISystem() {}
+       GHOST_ISystem() {
+       }
 
        /**
         * Destructor.
         * Protected default constructor to force use of static dispose member.
         */
-       virtual ~GHOST_ISystem() {}
+       virtual ~GHOST_ISystem() {
+       }
 
 public:
        /***************************************************************************************
-        ** Time(r) functionality
-        ***************************************************************************************/
+       ** Time(r) functionality
+       ***************************************************************************************/
 
        /**
         * Returns the system time.
@@ -196,7 +198,7 @@ public:
         * @param userData      Placeholder for user data.
         * @return A timer task (0 if timer task installation failed).
         */
-       virtual GHOST_ITimerTaskinstallTimer(GHOST_TUns64 delay,
+       virtual GHOST_ITimerTask *installTimer(GHOST_TUns64 delay,
                                               GHOST_TUns64 interval,
                                               GHOST_TimerProcPtr timerProc,
                                               GHOST_TUserDataPtr userData = 0) = 0;
@@ -206,17 +208,17 @@ public:
         * @param timerTask Timer task to be removed.
         * @return Indication of success.
         */
-       virtual GHOST_TSuccess removeTimer(GHOST_ITimerTasktimerTask) = 0;
+       virtual GHOST_TSuccess removeTimer(GHOST_ITimerTask *timerTask) = 0;
 
        /***************************************************************************************
-        ** Display/window management functionality
-        ***************************************************************************************/
+       ** Display/window management functionality
+       ***************************************************************************************/
 
        /**
         * Returns the number of displays on this system.
         * @return The number of displays.
         */
-       virtual GHOST_TUns8 getNumDisplays() const = 0;
+       virtual GHOST_TUns8 getNumDisplays() const = 0;
 
        /**
         * Returns the dimensions of the main display on this system.
@@ -237,30 +239,30 @@ public:
         * @param       type                    The type of drawing context installed in this window.
         * @param       stereoVisual    Create a stereo visual for quad buffered stereo.
         * @param       numOfAASamples  Number of samples used for AA (zero if no AA)