[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58994] branches/soc-2013-dingto: Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Wed Aug 7 18:57:18 CEST 2013
Revision: 58994
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58994
Author: dingto
Date: 2013-08-07 16:57:18 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
Merged revision(s) 58859-58993 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/soc-2013-dingto/intern/cycles/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_light.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2013-dingto/intern/cycles/render/blackbody.cpp
branches/soc-2013-dingto/intern/cycles/render/light.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/dualcon/dualcon.h
branches/soc-2013-dingto/intern/dualcon/intern/GeoCommon.h
branches/soc-2013-dingto/intern/dualcon/intern/MemoryAllocator.h
branches/soc-2013-dingto/intern/dualcon/intern/ModelReader.h
branches/soc-2013-dingto/intern/dualcon/intern/Projections.cpp
branches/soc-2013-dingto/intern/dualcon/intern/Projections.h
branches/soc-2013-dingto/intern/dualcon/intern/Queue.h
branches/soc-2013-dingto/intern/dualcon/intern/cubes.h
branches/soc-2013-dingto/intern/dualcon/intern/dualcon_c_api.cpp
branches/soc-2013-dingto/intern/dualcon/intern/manifold_table.h
branches/soc-2013-dingto/intern/dualcon/intern/marching_cubes_table.h
branches/soc-2013-dingto/intern/dualcon/intern/octree.cpp
branches/soc-2013-dingto/intern/dualcon/intern/octree.h
branches/soc-2013-dingto/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-dingto/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-dingto/intern/mikktspace/mikktspace.c
branches/soc-2013-dingto/intern/rigidbody/rb_bullet_api.cpp
branches/soc-2013-dingto/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-dingto/source/blender/avi/intern/avi_mjpeg.c
branches/soc-2013-dingto/source/blender/blenfont/BLF_api.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/action.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/blender.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/key.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/library.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/multires.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/navmesh_conversion.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sketch.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string.h
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-dingto/source/blender/blenlib/intern/buffer.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-dingto/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-dingto/source/blender/blenlib/intern/voronoi.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/blenloader/intern/runtime.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_structure.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-dingto/source/blender/compositor/CMakeLists.txt
branches/soc-2013-dingto/source/blender/compositor/COM_compositor.h
branches/soc-2013-dingto/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-dingto/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2013-dingto/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_select.c
branches/soc-2013-dingto/source/blender/editors/armature/pose_transform.c
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_layout.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_ops.c
branches/soc-2013-dingto/source/blender/editors/interface/resources.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/object/object_hook.c
branches/soc-2013-dingto/source/blender/editors/object/object_modifier.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
branches/soc-2013-dingto/source/blender/editors/screen/area.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/space_file/space_file.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_add.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_edit.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-dingto/source/blender/freestyle/intern/application/AppView.h
branches/soc-2013-dingto/source/blender/freestyle/intern/application/Controller.h
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/FastGrid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/Noise.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/Polygon.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/SweepLine.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/VecMat.h
branches/soc-2013-dingto/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/soc-2013-dingto/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2013-dingto/source/blender/freestyle/intern/image/Image.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/Node.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/NodeCamera.h
branches/soc-2013-dingto/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/Module.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/Operators.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/soc-2013-dingto/source/blender/freestyle/intern/stroke/StyleModule.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/BaseIterator.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/BaseObject.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/Exception.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/Id.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/Interpreter.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/ProgressBar.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/PseudoNoise.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/RandGen.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/RenderMonitor.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/TimeStamp.h
branches/soc-2013-dingto/source/blender/freestyle/intern/system/TimeUtils.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/Interface1D.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapIterators.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
branches/soc-2013-dingto/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-dingto/source/blender/makesrna/SConscript
branches/soc-2013-dingto/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-dingto/source/blender/makesrna/intern/SConscript
branches/soc-2013-dingto/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna.c
branches/soc-2013-dingto/source/blender/render/intern/source/bake.c
branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
branches/soc-2013-dingto/source/blender/render/intern/source/envmap.c
branches/soc-2013-dingto/source/blender/render/intern/source/initrender.c
branches/soc-2013-dingto/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-dingto/source/blender/render/intern/source/occlusion.c
branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.c
branches/soc-2013-dingto/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-dingto/source/blender/render/intern/source/rayshade.c
branches/soc-2013-dingto/source/blender/render/intern/source/render_result.c
branches/soc-2013-dingto/source/blender/render/intern/source/render_texture.c
branches/soc-2013-dingto/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-dingto/source/blender/render/intern/source/strand.c
branches/soc-2013-dingto/source/blender/render/intern/source/zbuf.c
branches/soc-2013-dingto/source/blender/windowmanager/WM_api.h
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-dingto/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-dingto/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2013-dingto/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-dingto/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-dingto/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_2DFilterManager.h
Added Paths:
-----------
branches/soc-2013-dingto/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_SplitOperation.h
Removed Paths:
-------------
branches/soc-2013-dingto/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ViewerBaseOperation.h
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-58993
Modified: branches/soc-2013-dingto/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
===================================================================
--- branches/soc-2013-dingto/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-08-07 16:57:18 UTC (rev 58994)
@@ -27,6 +27,12 @@
:type: float
+ .. attribute:: fov
+
+ The camera's field of view value.
+
+ :type: float
+
.. attribute:: ortho_scale
The camera's view scale when in orthographic mode.
Modified: branches/soc-2013-dingto/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/intern/cycles/CMakeLists.txt 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/CMakeLists.txt 2013-08-07 16:57:18 UTC (rev 58994)
@@ -19,8 +19,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ox")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /Ox")
elseif(CMAKE_COMPILER_IS_GNUCC)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h 2013-08-07 16:57:18 UTC (rev 58994)
@@ -286,7 +286,7 @@
#ifdef __PASSES__
/* this division is a bit ugly, but means we only have to keep track of
* only a single throughput further along the path, here we recover just
- * the indirect parth that is not influenced by any particular BSDF type */
+ * the indirect path that is not influenced by any particular BSDF type */
if(L->use_light_pass) {
L->direct_emission = safe_divide_color(L->direct_emission, L->direct_throughput);
L->direct_diffuse += L->path_diffuse*L->direct_emission;
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_light.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_light.h 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_light.h 2013-08-07 16:57:18 UTC (rev 58994)
@@ -375,7 +375,7 @@
ls->pdf = invarea;
if(type == LIGHT_SPOT) {
- /* spot light attentuation */
+ /* spot light attenuation */
float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2);
ls->eval_fac *= spot_light_attenuation(data1, data2, ls);
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h 2013-08-07 16:57:18 UTC (rev 58994)
@@ -44,11 +44,11 @@
#define BSSRDF_MIN_RADIUS 1e-8f
#define BSSRDF_MAX_ATTEMPTS 8
-#define BB_DRAPPER 800.0
-#define BB_MAX_TABLE_RANGE 12000.0
-#define BB_TABLE_XPOWER 1.5
-#define BB_TABLE_YPOWER 5.0
-#define BB_TABLE_SPACING 2.0
+#define BB_DRAPPER 800.0f
+#define BB_MAX_TABLE_RANGE 12000.0f
+#define BB_TABLE_XPOWER 1.5f
+#define BB_TABLE_YPOWER 5.0f
+#define BB_TABLE_SPACING 2.0f
#define TEX_NUM_FLOAT_IMAGES 5
@@ -833,7 +833,7 @@
typedef struct KernelBlackbody {
int table_offset;
int pad1, pad2, pad3;
-} KernelBLACKBODY;
+} KernelBlackbody;
typedef struct KernelData {
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_globals.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_globals.h 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_globals.h 2013-08-07 16:57:18 UTC (rev 58994)
@@ -87,9 +87,10 @@
/* thread key for thread specific data lookup */
struct OSLThreadData {
OSL::ShaderGlobals globals;
- OSL::PerThreadInfo *thread_info;
+ OSL::PerThreadInfo *osl_thread_info;
OSLTraceData tracedata;
OSL::ShadingContext *context[SHADER_CONTEXT_NUM];
+ OIIO::TextureSystem::Perthread *oiio_thread_info;
};
CCL_NAMESPACE_END
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp 2013-08-07 16:57:18 UTC (rev 58994)
@@ -775,8 +775,16 @@
float dsdy, float dtdy, float *result)
{
OSL::TextureSystem *ts = osl_ts;
- bool status = ts->texture(filename, options, s, t, dsdx, dtdx, dsdy, dtdy, result);
+ ShaderData *sd = (ShaderData *)(sg->renderstate);
+ KernelGlobals *kg = sd->osl_globals;
+ OSLThreadData *tdata = kg->osl_tdata;
+ OIIO::TextureSystem::Perthread *thread_info = tdata->oiio_thread_info;
+ OIIO::TextureSystem::TextureHandle *th = ts->get_texture_handle(filename, thread_info);
+
+ bool status = ts->texture(th, thread_info,
+ options, s, t, dsdx, dtdx, dsdy, dtdy, result);
+
if(!status) {
if(options.nchannels == 3 || options.nchannels == 4) {
result[0] = 1.0f;
@@ -797,8 +805,16 @@
const OSL::Vec3 &dPdz, float *result)
{
OSL::TextureSystem *ts = osl_ts;
- bool status = ts->texture3d(filename, options, P, dPdx, dPdy, dPdz, result);
+ ShaderData *sd = (ShaderData *)(sg->renderstate);
+ KernelGlobals *kg = sd->osl_globals;
+ OSLThreadData *tdata = kg->osl_tdata;
+ OIIO::TextureSystem::Perthread *thread_info = tdata->oiio_thread_info;
+ OIIO::TextureSystem::TextureHandle *th = ts->get_texture_handle(filename, thread_info);
+
+ bool status = ts->texture3d(th, thread_info,
+ options, P, dPdx, dPdy, dPdz, result);
+
if(!status) {
if(options.nchannels == 3 || options.nchannels == 4) {
result[0] = 1.0f;
@@ -819,8 +835,15 @@
const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, float *result)
{
OSL::TextureSystem *ts = osl_ts;
- bool status = ts->environment(filename, options, R, dRdx, dRdy, result);
+ ShaderData *sd = (ShaderData *)(sg->renderstate);
+ KernelGlobals *kg = sd->osl_globals;
+ OSLThreadData *tdata = kg->osl_tdata;
+ OIIO::TextureSystem::Perthread *thread_info = tdata->oiio_thread_info;
+ OIIO::TextureSystem::TextureHandle *th = ts->get_texture_handle(filename, thread_info);
+ bool status = ts->environment(th, thread_info,
+ options, R, dRdx, dRdy, result);
+
if(!status) {
if(options.nchannels == 3 || options.nchannels == 4) {
result[0] = 1.0f;
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-07 15:51:57 UTC (rev 58993)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-07 16:57:18 UTC (rev 58994)
@@ -55,11 +55,13 @@
memset(&tdata->globals, 0, sizeof(OSL::ShaderGlobals));
tdata->globals.tracedata = &tdata->tracedata;
tdata->globals.flipHandedness = false;
- tdata->thread_info = ss->create_thread_info();
+ tdata->osl_thread_info = ss->create_thread_info();
for(int i = 0; i < SHADER_CONTEXT_NUM; i++)
- tdata->context[i] = ss->get_context(tdata->thread_info);
+ tdata->context[i] = ss->get_context(tdata->osl_thread_info);
+ tdata->oiio_thread_info = osl_globals->ts->get_perthread_info();
+
kg->osl_ss = (OSLShadingSystem*)ss;
kg->osl_tdata = tdata;
}
@@ -75,7 +77,7 @@
for(int i = 0; i < SHADER_CONTEXT_NUM; i++)
ss->release_context(tdata->context[i]);
- ss->destroy_thread_info(tdata->thread_info);
+ ss->destroy_thread_info(tdata->osl_thread_info);
delete tdata;
Modified: branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_blackbody.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list