[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50511] branches/ge_components: Merged revision(s) 50268-50509 from trunk/blender:
Mitchell Stokes
mogurijin at gmail.com
Mon Sep 10 23:41:45 CEST 2012
Revision: 50511
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50511
Author: moguri
Date: 2012-09-10 21:41:44 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Merged revision(s) 50268-50509 from trunk/blender:
Modified Paths:
--------------
branches/ge_components/CMakeLists.txt
branches/ge_components/build_files/cmake/macros.cmake
branches/ge_components/build_files/scons/config/win32-mingw-config.py
branches/ge_components/build_files/scons/config/win64-mingw-config.py
branches/ge_components/doc/python_api/sphinx_doc_gen.py
branches/ge_components/extern/bullet2/CMakeLists.txt
branches/ge_components/intern/audaspace/intern/AUD_ReferenceHandler.cpp
branches/ge_components/intern/cycles/CMakeLists.txt
branches/ge_components/intern/cycles/app/cycles_test.cpp
branches/ge_components/intern/cycles/app/cycles_xml.cpp
branches/ge_components/intern/cycles/blender/addon/properties.py
branches/ge_components/intern/cycles/blender/addon/ui.py
branches/ge_components/intern/cycles/blender/blender_mesh.cpp
branches/ge_components/intern/cycles/blender/blender_object.cpp
branches/ge_components/intern/cycles/blender/blender_particles.cpp
branches/ge_components/intern/cycles/blender/blender_python.cpp
branches/ge_components/intern/cycles/blender/blender_session.cpp
branches/ge_components/intern/cycles/blender/blender_session.h
branches/ge_components/intern/cycles/blender/blender_shader.cpp
branches/ge_components/intern/cycles/blender/blender_sync.cpp
branches/ge_components/intern/cycles/blender/blender_sync.h
branches/ge_components/intern/cycles/blender/blender_util.h
branches/ge_components/intern/cycles/cmake/external_libs.cmake
branches/ge_components/intern/cycles/device/CMakeLists.txt
branches/ge_components/intern/cycles/device/device.cpp
branches/ge_components/intern/cycles/device/device.h
branches/ge_components/intern/cycles/device/device_cpu.cpp
branches/ge_components/intern/cycles/device/device_cuda.cpp
branches/ge_components/intern/cycles/device/device_multi.cpp
branches/ge_components/intern/cycles/device/device_opencl.cpp
branches/ge_components/intern/cycles/kernel/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/kernel.cpp
branches/ge_components/intern/cycles/kernel/kernel_accumulate.h
branches/ge_components/intern/cycles/kernel/kernel_compat_cpu.h
branches/ge_components/intern/cycles/kernel/kernel_displace.h
branches/ge_components/intern/cycles/kernel/kernel_globals.h
branches/ge_components/intern/cycles/kernel/kernel_object.h
branches/ge_components/intern/cycles/kernel/kernel_path.h
branches/ge_components/intern/cycles/kernel/kernel_shader.h
branches/ge_components/intern/cycles/kernel/kernel_textures.h
branches/ge_components/intern/cycles/kernel/kernel_triangle.h
branches/ge_components/intern/cycles/kernel/kernel_types.h
branches/ge_components/intern/cycles/kernel/osl/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/ge_components/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_checker_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_gamma.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_invert.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_math.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_normal.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_texture.h
branches/ge_components/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_wave_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/stdosl.h
branches/ge_components/intern/cycles/kernel/osl/osl_closures.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_closures.h
branches/ge_components/intern/cycles/kernel/osl/osl_globals.h
branches/ge_components/intern/cycles/kernel/osl/osl_services.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_services.h
branches/ge_components/intern/cycles/kernel/osl/osl_shader.cpp
branches/ge_components/intern/cycles/kernel/osl/osl_shader.h
branches/ge_components/intern/cycles/kernel/svm/svm.h
branches/ge_components/intern/cycles/kernel/svm/svm_geometry.h
branches/ge_components/intern/cycles/kernel/svm/svm_image.h
branches/ge_components/intern/cycles/kernel/svm/svm_mix.h
branches/ge_components/intern/cycles/kernel/svm/svm_tex_coord.h
branches/ge_components/intern/cycles/kernel/svm/svm_types.h
branches/ge_components/intern/cycles/render/CMakeLists.txt
branches/ge_components/intern/cycles/render/attribute.cpp
branches/ge_components/intern/cycles/render/attribute.h
branches/ge_components/intern/cycles/render/buffers.cpp
branches/ge_components/intern/cycles/render/buffers.h
branches/ge_components/intern/cycles/render/camera.cpp
branches/ge_components/intern/cycles/render/camera.h
branches/ge_components/intern/cycles/render/graph.cpp
branches/ge_components/intern/cycles/render/graph.h
branches/ge_components/intern/cycles/render/image.cpp
branches/ge_components/intern/cycles/render/image.h
branches/ge_components/intern/cycles/render/light.cpp
branches/ge_components/intern/cycles/render/mesh.cpp
branches/ge_components/intern/cycles/render/nodes.cpp
branches/ge_components/intern/cycles/render/nodes.h
branches/ge_components/intern/cycles/render/object.cpp
branches/ge_components/intern/cycles/render/object.h
branches/ge_components/intern/cycles/render/osl.cpp
branches/ge_components/intern/cycles/render/scene.cpp
branches/ge_components/intern/cycles/render/scene.h
branches/ge_components/intern/cycles/render/session.cpp
branches/ge_components/intern/cycles/render/session.h
branches/ge_components/intern/cycles/render/tile.cpp
branches/ge_components/intern/cycles/render/tile.h
branches/ge_components/intern/cycles/util/CMakeLists.txt
branches/ge_components/intern/cycles/util/util_math.h
branches/ge_components/intern/cycles/util/util_progress.h
branches/ge_components/intern/cycles/util/util_types.h
branches/ge_components/intern/ghost/GHOST_IEvent.h
branches/ge_components/intern/ghost/GHOST_IEventConsumer.h
branches/ge_components/intern/ghost/GHOST_ISystem.h
branches/ge_components/intern/ghost/GHOST_ISystemPaths.h
branches/ge_components/intern/ghost/GHOST_ITimerTask.h
branches/ge_components/intern/ghost/GHOST_IWindow.h
branches/ge_components/intern/ghost/GHOST_Path-api.h
branches/ge_components/intern/ghost/GHOST_Rect.h
branches/ge_components/intern/ghost/GHOST_Types.h
branches/ge_components/intern/ghost/intern/GHOST_Buttons.h
branches/ge_components/intern/ghost/intern/GHOST_C-api.cpp
branches/ge_components/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
branches/ge_components/intern/ghost/intern/GHOST_CallbackEventConsumer.h
branches/ge_components/intern/ghost/intern/GHOST_DisplayManager.cpp
branches/ge_components/intern/ghost/intern/GHOST_DisplayManager.h
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerCocoa.h
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerWin32.h
branches/ge_components/intern/ghost/intern/GHOST_DisplayManagerX11.h
branches/ge_components/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/ge_components/intern/ghost/intern/GHOST_DropTargetWin32.h
branches/ge_components/intern/ghost/intern/GHOST_DropTargetX11.h
branches/ge_components/intern/ghost/intern/GHOST_Event.h
branches/ge_components/intern/ghost/intern/GHOST_EventButton.h
branches/ge_components/intern/ghost/intern/GHOST_EventCursor.h
branches/ge_components/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/ge_components/intern/ghost/intern/GHOST_EventKey.h
branches/ge_components/intern/ghost/intern/GHOST_EventManager.cpp
branches/ge_components/intern/ghost/intern/GHOST_EventManager.h
branches/ge_components/intern/ghost/intern/GHOST_EventPrinter.h
branches/ge_components/intern/ghost/intern/GHOST_EventString.h
branches/ge_components/intern/ghost/intern/GHOST_EventTrackpad.h
branches/ge_components/intern/ghost/intern/GHOST_EventWheel.h
branches/ge_components/intern/ghost/intern/GHOST_ISystem.cpp
branches/ge_components/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/ge_components/intern/ghost/intern/GHOST_ModifierKeys.cpp
branches/ge_components/intern/ghost/intern/GHOST_ModifierKeys.h
branches/ge_components/intern/ghost/intern/GHOST_System.h
branches/ge_components/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/ge_components/intern/ghost/intern/GHOST_SystemCarbon.h
branches/ge_components/intern/ghost/intern/GHOST_SystemCocoa.h
branches/ge_components/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/ge_components/intern/ghost/intern/GHOST_SystemPaths.h
branches/ge_components/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/ge_components/intern/ghost/intern/GHOST_SystemPathsCocoa.h
branches/ge_components/intern/ghost/intern/GHOST_SystemPathsWin32.h
branches/ge_components/intern/ghost/intern/GHOST_SystemPathsX11.h
branches/ge_components/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/ge_components/intern/ghost/intern/GHOST_SystemWin32.h
branches/ge_components/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_components/intern/ghost/intern/GHOST_SystemX11.h
branches/ge_components/intern/ghost/intern/GHOST_TimerManager.cpp
branches/ge_components/intern/ghost/intern/GHOST_TimerManager.h
branches/ge_components/intern/ghost/intern/GHOST_TimerTask.h
branches/ge_components/intern/ghost/intern/GHOST_Window.cpp
branches/ge_components/intern/ghost/intern/GHOST_Window.h
branches/ge_components/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/ge_components/intern/ghost/intern/GHOST_WindowCarbon.h
branches/ge_components/intern/ghost/intern/GHOST_WindowCocoa.h
branches/ge_components/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/ge_components/intern/ghost/intern/GHOST_WindowManager.cpp
branches/ge_components/intern/ghost/intern/GHOST_WindowManager.h
branches/ge_components/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_components/intern/ghost/intern/GHOST_WindowWin32.h
branches/ge_components/intern/ghost/intern/GHOST_WindowX11.cpp
branches/ge_components/intern/ghost/intern/GHOST_WindowX11.h
branches/ge_components/intern/ghost/test/gears/GHOST_C-Test.c
branches/ge_components/intern/ghost/test/gears/GHOST_Test.cpp
branches/ge_components/intern/ghost/test/multitest/EventToBuf.c
branches/ge_components/intern/ghost/test/multitest/MultiTest.c
branches/ge_components/intern/guardedalloc/intern/mmap_win.c
branches/ge_components/intern/opennl/intern/opennl.c
branches/ge_components/intern/utfconv/utf_winfunc.c
branches/ge_components/release/datafiles/fonts/droidsans.ttf.gz
branches/ge_components/release/scripts/modules/addon_utils.py
branches/ge_components/release/scripts/startup/bl_operators/object_quick_effects.py
branches/ge_components/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/ge_components/release/scripts/startup/bl_operators/wm.py
branches/ge_components/release/scripts/startup/bl_ui/space_sequencer.py
branches/ge_components/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/ge_components/release/scripts/templates/operator_modal.py
branches/ge_components/release/scripts/templates/operator_modal_draw.py
branches/ge_components/release/scripts/templates/operator_modal_timer.py
branches/ge_components/release/scripts/templates/operator_modal_view3d.py
branches/ge_components/source/blender/blenfont/intern/blf_dir.c
branches/ge_components/source/blender/blenfont/intern/blf_lang.c
branches/ge_components/source/blender/blenkernel/BKE_DerivedMesh.h
branches/ge_components/source/blender/blenkernel/BKE_anim.h
branches/ge_components/source/blender/blenkernel/BKE_armature.h
branches/ge_components/source/blender/blenkernel/BKE_blender.h
branches/ge_components/source/blender/blenkernel/BKE_customdata.h
branches/ge_components/source/blender/blenkernel/BKE_deform.h
branches/ge_components/source/blender/blenkernel/BKE_mask.h
branches/ge_components/source/blender/blenkernel/BKE_node.h
branches/ge_components/source/blender/blenkernel/BKE_script.h
branches/ge_components/source/blender/blenkernel/BKE_sequencer.h
branches/ge_components/source/blender/blenkernel/BKE_shrinkwrap.h
branches/ge_components/source/blender/blenkernel/BKE_tessmesh.h
branches/ge_components/source/blender/blenkernel/BKE_utildefines.h
branches/ge_components/source/blender/blenkernel/CMakeLists.txt
branches/ge_components/source/blender/blenkernel/intern/DerivedMesh.c
branches/ge_components/source/blender/blenkernel/intern/action.c
branches/ge_components/source/blender/blenkernel/intern/anim.c
branches/ge_components/source/blender/blenkernel/intern/anim_sys.c
branches/ge_components/source/blender/blenkernel/intern/armature.c
branches/ge_components/source/blender/blenkernel/intern/blender.c
branches/ge_components/source/blender/blenkernel/intern/cdderivedmesh.c
branches/ge_components/source/blender/blenkernel/intern/constraint.c
branches/ge_components/source/blender/blenkernel/intern/customdata.c
branches/ge_components/source/blender/blenkernel/intern/customdata_file.c
branches/ge_components/source/blender/blenkernel/intern/deform.c
branches/ge_components/source/blender/blenkernel/intern/depsgraph.c
branches/ge_components/source/blender/blenkernel/intern/editderivedmesh.c
branches/ge_components/source/blender/blenkernel/intern/fcurve.c
branches/ge_components/source/blender/blenkernel/intern/font.c
branches/ge_components/source/blender/blenkernel/intern/idprop.c
branches/ge_components/source/blender/blenkernel/intern/image.c
branches/ge_components/source/blender/blenkernel/intern/implicit.c
branches/ge_components/source/blender/blenkernel/intern/library.c
branches/ge_components/source/blender/blenkernel/intern/mask_evaluate.c
branches/ge_components/source/blender/blenkernel/intern/mball.c
branches/ge_components/source/blender/blenkernel/intern/movieclip.c
branches/ge_components/source/blender/blenkernel/intern/node.c
branches/ge_components/source/blender/blenkernel/intern/ocean.c
branches/ge_components/source/blender/blenkernel/intern/packedFile.c
branches/ge_components/source/blender/blenkernel/intern/pointcache.c
branches/ge_components/source/blender/blenkernel/intern/sca.c
branches/ge_components/source/blender/blenkernel/intern/seqeffects.c
branches/ge_components/source/blender/blenkernel/intern/seqmodifier.c
branches/ge_components/source/blender/blenkernel/intern/sequencer.c
branches/ge_components/source/blender/blenkernel/intern/shrinkwrap.c
branches/ge_components/source/blender/blenkernel/intern/sound.c
branches/ge_components/source/blender/blenkernel/intern/text.c
branches/ge_components/source/blender/blenkernel/intern/texture.c
branches/ge_components/source/blender/blenkernel/intern/tracking.c
branches/ge_components/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_components/source/blender/blenlib/BLI_fileops.h
branches/ge_components/source/blender/blenlib/BLI_math_base.h
branches/ge_components/source/blender/blenlib/BLI_math_vector.h
branches/ge_components/source/blender/blenlib/BLI_path_util.h
branches/ge_components/source/blender/blenlib/BLI_utildefines.h
branches/ge_components/source/blender/blenlib/CMakeLists.txt
branches/ge_components/source/blender/blenlib/intern/BLI_memarena.c
branches/ge_components/source/blender/blenlib/intern/BLI_mempool.c
branches/ge_components/source/blender/blenlib/intern/bpath.c
branches/ge_components/source/blender/blenlib/intern/fileops.c
branches/ge_components/source/blender/blenlib/intern/math_vector_inline.c
branches/ge_components/source/blender/blenlib/intern/path_util.c
branches/ge_components/source/blender/blenlib/intern/storage.c
branches/ge_components/source/blender/blenlib/intern/winstuff.c
branches/ge_components/source/blender/blenloader/CMakeLists.txt
branches/ge_components/source/blender/blenloader/intern/readblenentry.c
branches/ge_components/source/blender/blenloader/intern/readfile.c
branches/ge_components/source/blender/blenloader/intern/runtime.c
branches/ge_components/source/blender/blenloader/intern/versioning_250.c
branches/ge_components/source/blender/blenloader/intern/versioning_legacy.c
branches/ge_components/source/blender/blenloader/intern/writefile.c
branches/ge_components/source/blender/bmesh/bmesh.h
branches/ge_components/source/blender/bmesh/intern/bmesh_core.c
branches/ge_components/source/blender/bmesh/intern/bmesh_marking.c
branches/ge_components/source/blender/bmesh/intern/bmesh_marking.h
branches/ge_components/source/blender/bmesh/intern/bmesh_operators.c
branches/ge_components/source/blender/bmesh/intern/bmesh_polygon.c
branches/ge_components/source/blender/bmesh/operators/bmo_connect.c
branches/ge_components/source/blender/bmesh/operators/bmo_extrude.c
branches/ge_components/source/blender/bmesh/operators/bmo_inset.c
branches/ge_components/source/blender/bmesh/operators/bmo_subdivide.c
branches/ge_components/source/blender/bmesh/tools/BME_bevel.c
branches/ge_components/source/blender/collada/AnimationImporter.cpp
branches/ge_components/source/blender/collada/DocumentExporter.cpp
branches/ge_components/source/blender/collada/DocumentImporter.cpp
branches/ge_components/source/blender/collada/ImageExporter.cpp
branches/ge_components/source/blender/collada/MeshImporter.cpp
branches/ge_components/source/blender/compositor/COM_compositor.h
branches/ge_components/source/blender/compositor/intern/COM_Converter.cpp
branches/ge_components/source/blender/compositor/intern/COM_Device.h
branches/ge_components/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
branches/ge_components/source/blender/compositor/intern/COM_Node.cpp
branches/ge_components/source/blender/compositor/intern/COM_Node.h
branches/ge_components/source/blender/compositor/intern/COM_NodeBase.h
branches/ge_components/source/blender/compositor/intern/COM_OpenCLDevice.cpp
branches/ge_components/source/blender/compositor/intern/COM_Socket.h
branches/ge_components/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/ge_components/source/blender/compositor/intern/COM_WorkScheduler.h
branches/ge_components/source/blender/compositor/intern/COM_compositor.cpp
branches/ge_components/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/ge_components/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/ge_components/source/blender/compositor/nodes/COM_MovieClipNode.cpp
branches/ge_components/source/blender/compositor/nodes/COM_OutputFileNode.cpp
branches/ge_components/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
branches/ge_components/source/blender/compositor/operations/COM_CompositorOperation.h
branches/ge_components/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/ge_components/source/blender/compositor/operations/COM_OutputFileOperation.h
branches/ge_components/source/blender/compositor/operations/COM_RenderLayersImageProg.h
branches/ge_components/source/blender/editors/animation/anim_channels_defines.c
branches/ge_components/source/blender/editors/animation/anim_deps.c
branches/ge_components/source/blender/editors/animation/anim_filter.c
branches/ge_components/source/blender/editors/animation/keyframes_general.c
branches/ge_components/source/blender/editors/armature/poseobject.c
branches/ge_components/source/blender/editors/armature/reeb.c
branches/ge_components/source/blender/editors/armature/reeb.h
branches/ge_components/source/blender/editors/curve/editcurve.c
branches/ge_components/source/blender/editors/gpencil/drawgpencil.c
branches/ge_components/source/blender/editors/gpencil/gpencil_paint.c
branches/ge_components/source/blender/editors/gpencil/gpencil_undo.c
branches/ge_components/source/blender/editors/include/ED_mesh.h
branches/ge_components/source/blender/editors/include/ED_render.h
branches/ge_components/source/blender/editors/include/ED_screen.h
branches/ge_components/source/blender/editors/include/UI_interface.h
branches/ge_components/source/blender/editors/include/UI_view2d.h
branches/ge_components/source/blender/editors/interface/interface.c
branches/ge_components/source/blender/editors/interface/interface_handlers.c
branches/ge_components/source/blender/editors/interface/interface_icons.c
branches/ge_components/source/blender/editors/interface/interface_intern.h
branches/ge_components/source/blender/editors/interface/interface_layout.c
branches/ge_components/source/blender/editors/interface/interface_ops.c
branches/ge_components/source/blender/editors/interface/interface_regions.c
branches/ge_components/source/blender/editors/interface/interface_style.c
branches/ge_components/source/blender/editors/interface/interface_templates.c
branches/ge_components/source/blender/editors/interface/interface_utils.c
branches/ge_components/source/blender/editors/interface/interface_widgets.c
branches/ge_components/source/blender/editors/interface/view2d.c
branches/ge_components/source/blender/editors/interface/view2d_ops.c
branches/ge_components/source/blender/editors/io/io_collada.c
branches/ge_components/source/blender/editors/io/io_collada.h
branches/ge_components/source/blender/editors/io/io_ops.h
branches/ge_components/source/blender/editors/mesh/editface.c
branches/ge_components/source/blender/editors/mesh/editmesh_add.c
branches/ge_components/source/blender/editors/mesh/editmesh_bvh.c
branches/ge_components/source/blender/editors/mesh/editmesh_knife.c
branches/ge_components/source/blender/editors/mesh/editmesh_rip.c
branches/ge_components/source/blender/editors/mesh/editmesh_select.c
branches/ge_components/source/blender/editors/mesh/editmesh_slide.c
branches/ge_components/source/blender/editors/mesh/editmesh_tools.c
branches/ge_components/source/blender/editors/mesh/editmesh_utils.c
branches/ge_components/source/blender/editors/mesh/mesh_data.c
branches/ge_components/source/blender/editors/mesh/mesh_intern.h
branches/ge_components/source/blender/editors/mesh/mesh_navmesh.c
branches/ge_components/source/blender/editors/mesh/meshtools.c
branches/ge_components/source/blender/editors/object/object_constraint.c
branches/ge_components/source/blender/editors/object/object_relations.c
branches/ge_components/source/blender/editors/object/object_vgroup.c
branches/ge_components/source/blender/editors/physics/particle_edit.c
branches/ge_components/source/blender/editors/screen/glutil.c
branches/ge_components/source/blender/editors/screen/screen_edit.c
branches/ge_components/source/blender/editors/screen/screen_ops.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_image.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_ops.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_undo.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_utils.c
branches/ge_components/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_components/source/blender/editors/sculpt_paint/sculpt.c
branches/ge_components/source/blender/editors/space_action/action_select.c
branches/ge_components/source/blender/editors/space_clip/clip_toolbar.c
branches/ge_components/source/blender/editors/space_graph/graph_draw.c
branches/ge_components/source/blender/editors/space_graph/graph_select.c
branches/ge_components/source/blender/editors/space_image/image_ops.c
branches/ge_components/source/blender/editors/space_image/space_image.c
branches/ge_components/source/blender/editors/space_info/info_stats.c
branches/ge_components/source/blender/editors/space_logic/logic_window.c
branches/ge_components/source/blender/editors/space_nla/nla_select.c
branches/ge_components/source/blender/editors/space_node/drawnode.c
branches/ge_components/source/blender/editors/space_node/node_buttons.c
branches/ge_components/source/blender/editors/space_node/node_edit.c
branches/ge_components/source/blender/editors/space_node/node_relationships.c
branches/ge_components/source/blender/editors/space_node/node_templates.c
branches/ge_components/source/blender/editors/space_outliner/outliner_draw.c
branches/ge_components/source/blender/editors/space_outliner/outliner_tree.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_draw.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_edit.c
branches/ge_components/source/blender/editors/space_sequencer/sequencer_intern.h
branches/ge_components/source/blender/editors/space_sequencer/sequencer_view.c
branches/ge_components/source/blender/editors/space_view3d/drawarmature.c
branches/ge_components/source/blender/editors/space_view3d/drawmesh.c
branches/ge_components/source/blender/editors/space_view3d/drawobject.c
branches/ge_components/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_components/source/blender/editors/space_view3d/view3d_edit.c
branches/ge_components/source/blender/editors/space_view3d/view3d_header.c
branches/ge_components/source/blender/editors/space_view3d/view3d_intern.h
branches/ge_components/source/blender/editors/space_view3d/view3d_select.c
branches/ge_components/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_components/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_components/source/blender/editors/space_view3d/view3d_view.c
branches/ge_components/source/blender/editors/transform/transform.c
branches/ge_components/source/blender/editors/transform/transform.h
branches/ge_components/source/blender/editors/transform/transform_conversions.c
branches/ge_components/source/blender/editors/transform/transform_orientations.c
branches/ge_components/source/blender/editors/transform/transform_snap.c
branches/ge_components/source/blender/editors/util/CMakeLists.txt
branches/ge_components/source/blender/editors/util/ed_util.c
branches/ge_components/source/blender/editors/util/editmode_undo.c
branches/ge_components/source/blender/editors/util/undo.c
branches/ge_components/source/blender/editors/uvedit/uvedit_draw.c
branches/ge_components/source/blender/editors/uvedit/uvedit_intern.h
branches/ge_components/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_components/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/ge_components/source/blender/gpu/GPU_buffers.h
branches/ge_components/source/blender/gpu/GPU_draw.h
branches/ge_components/source/blender/gpu/GPU_extensions.h
branches/ge_components/source/blender/gpu/GPU_material.h
branches/ge_components/source/blender/gpu/intern/gpu_codegen.c
branches/ge_components/source/blender/gpu/intern/gpu_codegen.h
branches/ge_components/source/blender/gpu/intern/gpu_draw.c
branches/ge_components/source/blender/gpu/intern/gpu_extensions.c
branches/ge_components/source/blender/gpu/intern/gpu_material.c
branches/ge_components/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/ge_components/source/blender/ikplugin/BIK_api.h
branches/ge_components/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/ge_components/source/blender/imbuf/IMB_imbuf.h
branches/ge_components/source/blender/imbuf/intern/IMB_indexer.h
branches/ge_components/source/blender/imbuf/intern/anim_movie.c
branches/ge_components/source/blender/imbuf/intern/bmp.c
branches/ge_components/source/blender/imbuf/intern/imbuf_cocoa.m
branches/ge_components/source/blender/imbuf/intern/indexer.c
branches/ge_components/source/blender/imbuf/intern/indexer_dv.c
branches/ge_components/source/blender/imbuf/intern/moviecache.c
branches/ge_components/source/blender/imbuf/intern/rectop.c
branches/ge_components/source/blender/imbuf/intern/thumbs.c
branches/ge_components/source/blender/imbuf/intern/thumbs_blend.c
branches/ge_components/source/blender/imbuf/intern/util.c
branches/ge_components/source/blender/makesdna/DNA_ipo_types.h
branches/ge_components/source/blender/makesdna/DNA_mesh_types.h
branches/ge_components/source/blender/makesdna/DNA_meshdata_types.h
branches/ge_components/source/blender/makesdna/DNA_node_types.h
branches/ge_components/source/blender/makesdna/DNA_scene_types.h
branches/ge_components/source/blender/makesdna/DNA_screen_types.h
branches/ge_components/source/blender/makesdna/DNA_sdna_types.h
branches/ge_components/source/blender/makesdna/DNA_sequence_types.h
branches/ge_components/source/blender/makesdna/DNA_userdef_types.h
branches/ge_components/source/blender/makesrna/intern/makesrna.c
branches/ge_components/source/blender/makesrna/intern/rna_access.c
branches/ge_components/source/blender/makesrna/intern/rna_armature.c
branches/ge_components/source/blender/makesrna/intern/rna_camera_api.c
branches/ge_components/source/blender/makesrna/intern/rna_define.c
branches/ge_components/source/blender/makesrna/intern/rna_fluidsim.c
branches/ge_components/source/blender/makesrna/intern/rna_gpencil.c
branches/ge_components/source/blender/makesrna/intern/rna_main.c
branches/ge_components/source/blender/makesrna/intern/rna_main_api.c
branches/ge_components/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_components/source/blender/makesrna/intern/rna_nodetree_types.h
branches/ge_components/source/blender/makesrna/intern/rna_object_api.c
branches/ge_components/source/blender/makesrna/intern/rna_render.c
branches/ge_components/source/blender/makesrna/intern/rna_scene.c
branches/ge_components/source/blender/makesrna/intern/rna_scene_api.c
branches/ge_components/source/blender/makesrna/intern/rna_sequencer.c
branches/ge_components/source/blender/makesrna/intern/rna_space.c
branches/ge_components/source/blender/makesrna/intern/rna_texture_api.c
branches/ge_components/source/blender/makesrna/intern/rna_userdef.c
branches/ge_components/source/blender/makesrna/intern/rna_wm_api.c
branches/ge_components/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/ge_components/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/ge_components/source/blender/modifiers/intern/MOD_mirror.c
branches/ge_components/source/blender/modifiers/intern/MOD_ocean.c
branches/ge_components/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/ge_components/source/blender/nodes/CMakeLists.txt
branches/ge_components/source/blender/nodes/NOD_shader.h
branches/ge_components/source/blender/nodes/composite/node_composite_tree.c
branches/ge_components/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/ge_components/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/ge_components/source/blender/nodes/intern/node_common.c
branches/ge_components/source/blender/nodes/shader/node_shader_tree.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/ge_components/source/blender/nodes/texture/node_texture_tree.c
branches/ge_components/source/blender/python/generic/bgl.c
branches/ge_components/source/blender/python/generic/py_capi_utils.c
branches/ge_components/source/blender/python/intern/bpy_interface.c
branches/ge_components/source/blender/quicktime/apple/qtkit_export.m
branches/ge_components/source/blender/render/extern/include/RE_engine.h
branches/ge_components/source/blender/render/extern/include/RE_pipeline.h
branches/ge_components/source/blender/render/extern/include/RE_render_ext.h
branches/ge_components/source/blender/render/intern/include/initrender.h
branches/ge_components/source/blender/render/intern/include/pixelshading.h
branches/ge_components/source/blender/render/intern/include/render_result.h
branches/ge_components/source/blender/render/intern/include/render_types.h
branches/ge_components/source/blender/render/intern/include/sunsky.h
branches/ge_components/source/blender/render/intern/include/volumetric.h
branches/ge_components/source/blender/render/intern/source/external_engine.c
branches/ge_components/source/blender/render/intern/source/initrender.c
branches/ge_components/source/blender/render/intern/source/pipeline.c
branches/ge_components/source/blender/render/intern/source/render_result.c
branches/ge_components/source/blender/render/intern/source/render_texture.c
branches/ge_components/source/blender/render/intern/source/texture_ocean.c
branches/ge_components/source/blender/windowmanager/WM_keymap.h
branches/ge_components/source/blender/windowmanager/WM_types.h
branches/ge_components/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_components/source/blender/windowmanager/intern/wm_operators.c
branches/ge_components/source/blender/windowmanager/intern/wm_playanim.c
branches/ge_components/source/blender/windowmanager/intern/wm_window.c
branches/ge_components/source/creator/CMakeLists.txt
branches/ge_components/source/creator/creator.c
branches/ge_components/source/darwin/blender.app/Contents/Info.plist
branches/ge_components/source/darwin/blenderplayer.app/Contents/Info.plist
branches/ge_components/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/ge_components/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/ge_components/source/gameengine/Expressions/PyObjectPlus.cpp
branches/ge_components/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/ge_components/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
branches/ge_components/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/ge_components/source/gameengine/Ketsji/CMakeLists.txt
branches/ge_components/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/ge_components/source/gameengine/Ketsji/KX_PythonInit.h
branches/ge_components/source/tests/pep8.py
branches/ge_components/source/tools/codereview_upload.py
Added Paths:
-----------
branches/ge_components/intern/cycles/device/device_task.cpp
branches/ge_components/intern/cycles/device/device_task.h
branches/ge_components/intern/cycles/kernel/kernel_attribute.h
branches/ge_components/intern/cycles/kernel/osl/bsdf_phong.cpp
branches/ge_components/intern/cycles/kernel/osl/nodes/node_brick_texture.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl
branches/ge_components/intern/cycles/kernel/osl/nodes/oslutil.h
branches/ge_components/intern/cycles/kernel/svm/svm_brick.h
branches/ge_components/intern/cycles/render/particles.cpp
branches/ge_components/intern/cycles/render/particles.h
branches/ge_components/intern/cycles/util/util_attribute.cpp
branches/ge_components/intern/cycles/util/util_attribute.h
branches/ge_components/source/blender/blenkernel/BKE_object_deform.h
branches/ge_components/source/blender/blenkernel/intern/object_deform.c
branches/ge_components/source/blender/blenlib/BLI_endian_switch.h
branches/ge_components/source/blender/blenlib/BLI_endian_switch_inline.h
branches/ge_components/source/blender/blenlib/intern/endian_switch.c
branches/ge_components/source/blender/blenloader/BLO_blend_defs.h
branches/ge_components/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/ge_components/source/gameengine/Ketsji/KX_PythonMain.cpp
branches/ge_components/source/gameengine/Ketsji/KX_PythonMain.h
Removed Paths:
-------------
branches/ge_components/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
Property Changed:
----------------
branches/ge_components/
branches/ge_components/source/blender/editors/interface/interface.c
branches/ge_components/source/blender/editors/space_outliner/
Property changes on: branches/ge_components
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bge_components:36315-36316,36318,36331,36389,36540
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:49306-50268
+ /branches/bge_components:36315-36316,36318,36331,36389,36540
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894
/trunk/blender:49306-50509
Modified: branches/ge_components/CMakeLists.txt
===================================================================
--- branches/ge_components/CMakeLists.txt 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/CMakeLists.txt 2012-09-10 21:41:44 UTC (rev 50511)
@@ -672,6 +672,31 @@
endif()
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
@@ -816,6 +841,31 @@
add_definitions(-D__SSE__ -D__MMX__)
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
if(MSVC)
set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
@@ -1432,6 +1482,31 @@
set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
endif()
+ if(WITH_CYCLES_OSL)
+ set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation")
+
+ message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")
+
+ find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+ find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+ # WARNING! depends on correct order of OSL libs linking
+ list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+ find_path(OSL_INCLUDES OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+ find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+ if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
+ set(OSL_FOUND TRUE)
+ message(STATUS "OSL includes = ${OSL_INCLUDES}")
+ message(STATUS "OSL library = ${OSL_LIBRARIES}")
+ message(STATUS "OSL compiler = ${OSL_COMPILER}")
+ else()
+ message(STATUS "OSL not found")
+ endif()
+
+ include_directories(${OSL_INCLUDES})
+ endif()
+
set(EXETYPE MACOSX_BUNDLE)
set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
Modified: branches/ge_components/build_files/cmake/macros.cmake
===================================================================
--- branches/ge_components/build_files/cmake/macros.cmake 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/build_files/cmake/macros.cmake 2012-09-10 21:41:44 UTC (rev 50511)
@@ -367,6 +367,9 @@
if(WITH_MOD_CLOTH_ELTOPO)
target_link_libraries(${target} ${LAPACK_LIBRARIES})
endif()
+ if(WITH_CYCLES_OSL)
+ target_link_libraries(${target} ${OSL_LIBRARIES})
+ endif()
if(WIN32 AND NOT UNIX)
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
Modified: branches/ge_components/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/ge_components/build_files/scons/config/win32-mingw-config.py 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/build_files/scons/config/win32-mingw-config.py 2012-09-10 21:41:44 UTC (rev 50511)
@@ -172,7 +172,7 @@
#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 :)
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
##
CC = 'gcc'
Modified: branches/ge_components/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/ge_components/build_files/scons/config/win64-mingw-config.py 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/build_files/scons/config/win64-mingw-config.py 2012-09-10 21:41:44 UTC (rev 50511)
@@ -151,7 +151,7 @@
WITH_BF_CYCLES = True
WITH_BF_CYCLES_CUDA_BINARIES = False
BF_CYCLES_CUDA_NVCC = "" # Path to the NVIDIA CUDA compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio'
Modified: branches/ge_components/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/ge_components/doc/python_api/sphinx_doc_gen.py 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/doc/python_api/sphinx_doc_gen.py 2012-09-10 21:41:44 UTC (rev 50511)
@@ -849,7 +849,7 @@
elif value_type in (bool, int, float, str, tuple):
# constant, not much fun we can do here except to list it.
# TODO, figure out some way to document these!
- #fw(".. data:: %s\n\n" % attribute)
+ fw(".. data:: %s\n\n" % attribute)
write_indented_lines(" ", fw, "constant value %s" % repr(value), False)
fw("\n")
else:
Modified: branches/ge_components/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/ge_components/extern/bullet2/CMakeLists.txt 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/extern/bullet2/CMakeLists.txt 2012-09-10 21:41:44 UTC (rev 50511)
@@ -314,6 +314,7 @@
src/BulletDynamics/Character/btKinematicCharacterController.h
src/BulletSoftBody/btSoftBody.h
+ src/BulletSoftBody/btSoftBodyInternals.h
src/BulletSoftBody/btSoftBodyData.h
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
src/BulletSoftBody/btSoftBodyHelpers.h
@@ -355,6 +356,7 @@
src/btBulletCollisionCommon.h
src/btBulletDynamicsCommon.h
+ src/Bullet-C-Api.h
)
if(CMAKE_COMPILER_IS_GNUCXX)
Modified: branches/ge_components/intern/audaspace/intern/AUD_ReferenceHandler.cpp
===================================================================
--- branches/ge_components/intern/audaspace/intern/AUD_ReferenceHandler.cpp 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/intern/audaspace/intern/AUD_ReferenceHandler.cpp 2012-09-10 21:41:44 UTC (rev 50511)
@@ -22,7 +22,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file audaspace/intern/AUD_Reference.cpp
+/** \file audaspace/intern/AUD_ReferenceHandler.cpp
* \ingroup audaspaceintern
*/
Modified: branches/ge_components/intern/cycles/CMakeLists.txt
===================================================================
--- branches/ge_components/intern/cycles/CMakeLists.txt 2012-09-10 20:35:20 UTC (rev 50510)
+++ branches/ge_components/intern/cycles/CMakeLists.txt 2012-09-10 21:41:44 UTC (rev 50511)
@@ -20,8 +20,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
-# for OSL, not needed yet
-# set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+# for OSL
+set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
# set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
# Definitions and Includes
Modified: branches/ge_components/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/ge_components/intern/cycles/app/cycles_test.cpp 2012-09-10 20:35:20 UTC (rev 50510)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list