[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41772] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 41768.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Nov 13 00:12:32 CET 2011
Revision: 41772
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41772
Author: kjym3
Date: 2011-11-12 23:12:30 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 41768.
Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Additional changes:
* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors. The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space. The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.
* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes. A fix of this
issue is planned.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41768
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_consistency_check.py
branches/soc-2008-mxcurioni/build_files/cmake/cmake_netbeans_project.py
branches/soc-2008-mxcurioni/build_files/cmake/config/blender_lite.cmake
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/build_files/scons/tools/mstoolkit.py
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2008-mxcurioni/intern/container/CTR_UHeap.h
branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_QSDecimator.cpp
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPaths.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_Test.cpp
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiter.h
branches/soc-2008-mxcurioni/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2008-mxcurioni/release/plugins/sequence/dnr.c
branches/soc-2008-mxcurioni/release/plugins/sequence/gamma.c
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/__init__.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_translation.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_anim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmfont.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_paint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_vfontdata.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blender_icons.png.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_image.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_movieclip.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
branches/soc-2008-mxcurioni/source/blender/nodes/NOD_shader.h
branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2008-mxcurioni/source/blender/python/SConscript
branches/soc-2008-mxcurioni/source/blender/python/generic/noise_py_api.c
branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_render_ext.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/pointdensity.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/voxeldata.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/IntValue.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/Texture.h
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/soc-2008-mxcurioni/intern/cycles/
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/app/
branches/soc-2008-mxcurioni/intern/cycles/app/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_server.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_test.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.h
branches/soc-2008-mxcurioni/intern/cycles/blender/
branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/presets.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/xml.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/
branches/soc-2008-mxcurioni/intern/cycles/bvh/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_params.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.h
branches/soc-2008-mxcurioni/intern/cycles/cmake/
branches/soc-2008-mxcurioni/intern/cycles/cmake/external_libs.cmake
branches/soc-2008-mxcurioni/intern/cycles/device/
branches/soc-2008-mxcurioni/intern/cycles/device/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_intern.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/doc/
branches/soc-2008-mxcurioni/intern/cycles/doc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Apache_2.0.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Blender.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Boost.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/GPL.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/ILM.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/NVidia.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/OSL.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Sobol.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/readme.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cl
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cu
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_film.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_math.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_mbvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_qbvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_triangle.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/background.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bssrdf.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/debug.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/emissive.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_reflection.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_refraction.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_transparent.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ward.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_westin.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/emissive.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_attribute.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_convert.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_gradient.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_magic.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mapping.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_math.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_musgrave.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noise.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noisetex.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_sky.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_value.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_voronoi.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/volume.h
branches/soc-2008-mxcurioni/intern/cycles/render/
branches/soc-2008-mxcurioni/intern/cycles/render/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.h
branches/soc-2008-mxcurioni/intern/cycles/render/background.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/background.h
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
branches/soc-2008-mxcurioni/intern/cycles/render/camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/camera.h
branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/film.h
branches/soc-2008-mxcurioni/intern/cycles/render/film_response.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/film_response.h
branches/soc-2008-mxcurioni/intern/cycles/render/filter.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/filter.h
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/image.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/image.h
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/light.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh_displace.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/object.h
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
branches/soc-2008-mxcurioni/intern/cycles/render/sobol.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/sobol.h
branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
branches/soc-2008-mxcurioni/intern/cycles/render/tile.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tile.h
branches/soc-2008-mxcurioni/intern/cycles/subd/
branches/soc-2008-mxcurioni/intern/cycles/subd/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_build.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_build.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_dice.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_dice.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_edge.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_face.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_mesh.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_patch.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_patch.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_ring.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_ring.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_split.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_split.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_stencil.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_stencil.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_vert.h
branches/soc-2008-mxcurioni/intern/cycles/util/
branches/soc-2008-mxcurioni/intern/cycles/util/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/util/util_algorithm.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_args.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_boundbox.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_color.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_debug.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_dynlib.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_dynlib.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_foreach.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_function.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_hash.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_image.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_list.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_map.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_memarena.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_memarena.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.c
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opengl.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_param.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_progress.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_set.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_string.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_string.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_time.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_time.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_vector.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_view.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_view.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_xml.h
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/direct_light.py
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/full_global_illumination.py
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/limited_global_illumination.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_dynamicpaint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/SConscript
branches/soc-2008-mxcurioni/intern/cycles/app/
branches/soc-2008-mxcurioni/intern/cycles/app/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_server.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_test.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.h
branches/soc-2008-mxcurioni/intern/cycles/blender/
branches/soc-2008-mxcurioni/intern/cycles/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/__init__.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/engine.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/enums.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/presets.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
branches/soc-2008-mxcurioni/intern/cycles/blender/addon/xml.py
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_python.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/
branches/soc-2008-mxcurioni/intern/cycles/bvh/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_params.h
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.cpp
branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.h
branches/soc-2008-mxcurioni/intern/cycles/cmake/
branches/soc-2008-mxcurioni/intern/cycles/cmake/external_libs.cmake
branches/soc-2008-mxcurioni/intern/cycles/device/
branches/soc-2008-mxcurioni/intern/cycles/device/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_intern.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_memory.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.cpp
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
branches/soc-2008-mxcurioni/intern/cycles/doc/
branches/soc-2008-mxcurioni/intern/cycles/doc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Apache_2.0.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Blender.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Boost.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/GPL.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/ILM.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/NVidia.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/OSL.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/Sobol.txt
branches/soc-2008-mxcurioni/intern/cycles/doc/license/readme.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/
branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cl
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.cu
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_bvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_differential.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_film.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_math.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_mbvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_qbvh.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_random.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_textures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_triangle.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/background.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/bssrdf.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/debug.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/emissive.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_background.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_color.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_value.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/stdosl.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_shader.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_reflection.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_refraction.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_transparent.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_ward.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_westin.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/emissive.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_attribute.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_bsdf.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_convert.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_displace.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_gradient.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_image.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_magic.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mapping.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_math.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_musgrave.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noise.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_noisetex.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_sky.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_value.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_voronoi.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/volume.h
branches/soc-2008-mxcurioni/intern/cycles/render/
branches/soc-2008-mxcurioni/intern/cycles/render/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/attribute.h
branches/soc-2008-mxcurioni/intern/cycles/render/background.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/background.h
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
branches/soc-2008-mxcurioni/intern/cycles/render/camera.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/camera.h
branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/film.h
branches/soc-2008-mxcurioni/intern/cycles/render/film_response.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/film_response.h
branches/soc-2008-mxcurioni/intern/cycles/render/filter.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/filter.h
branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/graph.h
branches/soc-2008-mxcurioni/intern/cycles/render/image.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/image.h
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/integrator.h
branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/light.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/mesh.h
branches/soc-2008-mxcurioni/intern/cycles/render/mesh_displace.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/object.h
branches/soc-2008-mxcurioni/intern/cycles/render/osl.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/osl.h
branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/session.h
branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/shader.h
branches/soc-2008-mxcurioni/intern/cycles/render/sobol.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/sobol.h
branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
branches/soc-2008-mxcurioni/intern/cycles/render/tile.cpp
branches/soc-2008-mxcurioni/intern/cycles/render/tile.h
branches/soc-2008-mxcurioni/intern/cycles/subd/
branches/soc-2008-mxcurioni/intern/cycles/subd/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_build.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_build.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_dice.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_dice.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_edge.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_face.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_mesh.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_mesh.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_patch.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_patch.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_ring.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_ring.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_split.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_split.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_stencil.cpp
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_stencil.h
branches/soc-2008-mxcurioni/intern/cycles/subd/subd_vert.h
branches/soc-2008-mxcurioni/intern/cycles/util/
branches/soc-2008-mxcurioni/intern/cycles/util/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/cycles/util/util_algorithm.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_args.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_boundbox.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cache.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_color.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_debug.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_dynlib.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_dynlib.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_foreach.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_function.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_hash.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_image.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_list.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_map.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_md5.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_memarena.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_memarena.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.c
branches/soc-2008-mxcurioni/intern/cycles/util/util_opencl.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_opengl.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_param.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_path.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_progress.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_set.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_string.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_string.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_system.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_time.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_time.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_vector.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_view.cpp
branches/soc-2008-mxcurioni/intern/cycles/util/util_view.h
branches/soc-2008-mxcurioni/intern/cycles/util/util_xml.h
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/direct_light.py
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/full_global_illumination.py
branches/soc-2008-mxcurioni/release/scripts/presets/cycles/integrator/limited_global_illumination.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-39896,39898-40096,40098-41638
+ /trunk/blender:34011-39896,39898-40096,40098-41768
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-11-12 22:22:00 UTC (rev 41771)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-11-12 23:12:30 UTC (rev 41772)
@@ -213,6 +213,12 @@
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
+# Cycles
+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")
+
# disable for now, but plan to support on all platforms eventually
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
@@ -284,6 +290,12 @@
set(WITH_HEADLESS ON)
endif()
+# auto enable openimageio and boost for cycles
+if(WITH_CYCLES)
+ set(WITH_OPENIMAGEIO ON)
+ set(WITH_BOOST ON)
+endif()
+
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
# don't store paths to libs for portable distrobution
@@ -349,6 +361,19 @@
set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
endif()
+ # set lib directory if it exists
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux64)
+ else()
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/linux)
+ endif()
+
+ if(NOT EXISTS ${LIBDIR})
+ unset(LIBDIR)
+ endif()
+ endif()
+
find_package(JPEG REQUIRED)
find_package(PNG REQUIRED)
find_package(ZLIB REQUIRED)
@@ -423,10 +448,17 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT FFMPEG)
+ set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+ else()
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+ endif()
+
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
- set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
mark_as_advanced(FFMPEG_LIBRARIES)
set(FFMPEG_LIBPATH ${FFMPEG}/lib)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS")
@@ -492,12 +524,17 @@
endif()
if(WITH_BOOST)
- set(BOOST "/usr" CACHE PATH "Boost Directory")
-
+ # uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM)
- set(BOOST_ROOT ${BOOST})
- set(Boost_USE_MULTITHREADED ON)
- find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT BOOST_ROOT)
+ set(BOOST_ROOT ${LIBDIR}/boost)
+ set(Boost_USE_MULTITHREADED OFF)
+ else()
+ set(Boost_USE_MULTITHREADED ON)
+ endif()
+ find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
+ mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif()
set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -507,10 +544,12 @@
endif()
if(WITH_OPENIMAGEIO)
- set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
+ # use lib dir if available and nothing else specified
+ if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
+ set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
+ endif()
- set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
- find_package(OpenImageIO REQUIRED)
+ find_package(OpenImageIO)
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere
@@ -518,6 +557,8 @@
if(NOT OPENIMAGEIO_FOUND)
set(WITH_OPENIMAGEIO OFF)
+ set(WITH_CYCLES OFF)
+ message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
endif()
endif()
@@ -843,7 +884,7 @@
else()
# keep GCC specific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
+ set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -942,26 +983,26 @@
if(WITH_BOOST)
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
- set(BOOST_POSTFIX "vc90-mt-s-1_46_1")
- set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1")
+ set(BOOST_POSTFIX "mgw45-mt-s-1_47")
+ set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
set(BOOST_LIBRARIES
- optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
- libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
- debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
- libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
- set(BOOST_LIBPATH ${BOOST}/lib)
- set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+ optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
+ boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+ debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
+ boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+ set(BOOST_LIBPATH ${BOOST}/lib/gcc)
+ set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
endif()
if(WITH_OPENIMAGEIO)
- set(OPENIMAGEIO ${LIBDIR}/openimageio)
+ set(OPENIMAGEIO ${LIBDIR}/gcc/openimageio)
set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
set(OPENIMAGEIO_LIBRARIES OpenImageIO)
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
- set(PLATFORM_LINKFLAGS "--stack,2097152")
+ set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
endif()
@@ -1480,6 +1521,7 @@
info_cfg_option(WITH_FFTW3)
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
+ info_cfg_option(WITH_CYCLES)
info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-11-12 22:22:00 UTC (rev 41771)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-11-12 23:12:30 UTC (rev 41772)
@@ -162,7 +162,7 @@
if sys.platform=='win32':
if env['CC'] in ['cl', 'cl.exe']:
- platform = 'win64-vc' if bitness == 64 else 'win32-vc'
+ platform = 'win64-vc' if bitness == 64 else 'win32-vc'
elif env['CC'] in ['gcc']:
platform = 'win32-mingw'
@@ -435,12 +435,12 @@
Export('env')
+BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
+SConscript(B.root_build_dir+'/source/SConscript')
BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
SConscript(B.root_build_dir+'/intern/SConscript')
BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
SConscript(B.root_build_dir+'/extern/SConscript')
-BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
-SConscript(B.root_build_dir+'/source/SConscript')
# now that we have read all SConscripts, we know what
# libraries will be built. Create list of
@@ -526,6 +526,50 @@
if len(source)==0:
env.Execute(Mkdir(dir))
scriptinstall.append(env.Install(dir=dir,source=source))
+ if env['WITH_BF_CYCLES']:
+ # cycles python code
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles')
+ source=os.listdir('intern/cycles/blender/addon')
+ if '.svn' in source: source.remove('.svn')
+ if '_svn' in source: source.remove('_svn')
+ if '__pycache__' in source: source.remove('__pycache__')
+ source=['intern/cycles/blender/addon/'+s for s in source]
+ scriptinstall.append(env.Install(dir=dir,source=source))
+
+ # cycles kernel code
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel')
+ source=os.listdir('intern/cycles/kernel')
+ if '.svn' in source: source.remove('.svn')
+ if '_svn' in source: source.remove('_svn')
+ if '__pycache__' in source: source.remove('__pycache__')
+ source.remove('kernel.cpp')
+ source.remove('CMakeLists.txt')
+ source.remove('svm')
+ source.remove('osl')
+ source=['intern/cycles/kernel/'+s for s in source]
+ source.append('intern/cycles/util/util_color.h')
+ source.append('intern/cycles/util/util_math.h')
+ source.append('intern/cycles/util/util_transform.h')
+ source.append('intern/cycles/util/util_types.h')
+ scriptinstall.append(env.Install(dir=dir,source=source))
+ # svm
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm')
+ source=os.listdir('intern/cycles/kernel/svm')
+ if '.svn' in source: source.remove('.svn')
+ if '_svn' in source: source.remove('_svn')
+ if '__pycache__' in source: source.remove('__pycache__')
+ source=['intern/cycles/kernel/svm/'+s for s in source]
+ scriptinstall.append(env.Install(dir=dir,source=source))
+
+ # licenses
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list