[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59048] branches/asset-browser: Merged revision(s) 58831-59047 from trunk/blender
Andrea Weikert
elubie at gmx.net
Sat Aug 10 14:44:50 CEST 2013
Revision: 59048
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59048
Author: elubie
Date: 2013-08-10 12:44:49 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
Merged revision(s) 58831-59047 from trunk/blender
Modified Paths:
--------------
branches/asset-browser/CMakeLists.txt
branches/asset-browser/build_files/build_environment/install_deps.sh
branches/asset-browser/build_files/cmake/cmake_static_check_smatch.py
branches/asset-browser/build_files/cmake/cmake_static_check_sparse.py
branches/asset-browser/build_files/cmake/project_source_info.py
branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/asset-browser/intern/cycles/CMakeLists.txt
branches/asset-browser/intern/cycles/blender/addon/ui.py
branches/asset-browser/intern/cycles/blender/blender_object.cpp
branches/asset-browser/intern/cycles/blender/blender_session.cpp
branches/asset-browser/intern/cycles/blender/blender_sync.cpp
branches/asset-browser/intern/cycles/device/device_cuda.cpp
branches/asset-browser/intern/cycles/device/device_task.h
branches/asset-browser/intern/cycles/kernel/closure/bsdf.h
branches/asset-browser/intern/cycles/kernel/kernel.cl
branches/asset-browser/intern/cycles/kernel/kernel.cpp
branches/asset-browser/intern/cycles/kernel/kernel.cu
branches/asset-browser/intern/cycles/kernel/kernel_accumulate.h
branches/asset-browser/intern/cycles/kernel/kernel_light.h
branches/asset-browser/intern/cycles/kernel/kernel_passes.h
branches/asset-browser/intern/cycles/kernel/kernel_path.h
branches/asset-browser/intern/cycles/kernel/kernel_shader.h
branches/asset-browser/intern/cycles/kernel/kernel_sse2.cpp
branches/asset-browser/intern/cycles/kernel/kernel_sse3.cpp
branches/asset-browser/intern/cycles/kernel/kernel_subsurface.h
branches/asset-browser/intern/cycles/kernel/kernel_types.h
branches/asset-browser/intern/cycles/kernel/osl/osl_globals.h
branches/asset-browser/intern/cycles/kernel/osl/osl_services.cpp
branches/asset-browser/intern/cycles/kernel/osl/osl_shader.cpp
branches/asset-browser/intern/cycles/kernel/shaders/node_texture.h
branches/asset-browser/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/asset-browser/intern/cycles/kernel/svm/svm_blackbody.h
branches/asset-browser/intern/cycles/kernel/svm/svm_fresnel.h
branches/asset-browser/intern/cycles/kernel/svm/svm_texture.h
branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
branches/asset-browser/intern/cycles/kernel/svm/svm_wave.h
branches/asset-browser/intern/cycles/render/blackbody.cpp
branches/asset-browser/intern/cycles/render/film.cpp
branches/asset-browser/intern/cycles/render/light.cpp
branches/asset-browser/intern/cycles/render/nodes.cpp
branches/asset-browser/intern/cycles/render/session.cpp
branches/asset-browser/intern/cycles/render/tile.cpp
branches/asset-browser/intern/dualcon/dualcon.h
branches/asset-browser/intern/dualcon/intern/GeoCommon.h
branches/asset-browser/intern/dualcon/intern/MemoryAllocator.h
branches/asset-browser/intern/dualcon/intern/ModelReader.h
branches/asset-browser/intern/dualcon/intern/Projections.cpp
branches/asset-browser/intern/dualcon/intern/Projections.h
branches/asset-browser/intern/dualcon/intern/Queue.h
branches/asset-browser/intern/dualcon/intern/cubes.h
branches/asset-browser/intern/dualcon/intern/dualcon_c_api.cpp
branches/asset-browser/intern/dualcon/intern/manifold_table.h
branches/asset-browser/intern/dualcon/intern/marching_cubes_table.h
branches/asset-browser/intern/dualcon/intern/octree.cpp
branches/asset-browser/intern/dualcon/intern/octree.h
branches/asset-browser/intern/guardedalloc/MEM_guardedalloc.h
branches/asset-browser/intern/guardedalloc/intern/mallocn.c
branches/asset-browser/intern/mikktspace/mikktspace.c
branches/asset-browser/intern/rigidbody/rb_bullet_api.cpp
branches/asset-browser/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/asset-browser/release/scripts/presets/keyconfig/3dsmax.py
branches/asset-browser/release/scripts/presets/keyconfig/maya.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/asset-browser/source/blender/avi/intern/avi_mjpeg.c
branches/asset-browser/source/blender/blenfont/BLF_api.h
branches/asset-browser/source/blender/blenkernel/BKE_image.h
branches/asset-browser/source/blender/blenkernel/BKE_node.h
branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
branches/asset-browser/source/blender/blenkernel/intern/action.c
branches/asset-browser/source/blender/blenkernel/intern/blender.c
branches/asset-browser/source/blender/blenkernel/intern/constraint.c
branches/asset-browser/source/blender/blenkernel/intern/curve.c
branches/asset-browser/source/blender/blenkernel/intern/dynamicpaint.c
branches/asset-browser/source/blender/blenkernel/intern/editderivedmesh.c
branches/asset-browser/source/blender/blenkernel/intern/fmodifier.c
branches/asset-browser/source/blender/blenkernel/intern/image.c
branches/asset-browser/source/blender/blenkernel/intern/image_gen.c
branches/asset-browser/source/blender/blenkernel/intern/key.c
branches/asset-browser/source/blender/blenkernel/intern/library.c
branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
branches/asset-browser/source/blender/blenkernel/intern/multires.c
branches/asset-browser/source/blender/blenkernel/intern/navmesh_conversion.c
branches/asset-browser/source/blender/blenkernel/intern/object.c
branches/asset-browser/source/blender/blenkernel/intern/packedFile.c
branches/asset-browser/source/blender/blenkernel/intern/particle.c
branches/asset-browser/source/blender/blenkernel/intern/pbvh.c
branches/asset-browser/source/blender/blenkernel/intern/shrinkwrap.c
branches/asset-browser/source/blender/blenkernel/intern/sketch.c
branches/asset-browser/source/blender/blenkernel/intern/smoke.c
branches/asset-browser/source/blender/blenkernel/intern/subsurf_ccg.c
branches/asset-browser/source/blender/blenkernel/intern/tracking.c
branches/asset-browser/source/blender/blenlib/BLI_buffer.h
branches/asset-browser/source/blender/blenlib/BLI_math_vector.h
branches/asset-browser/source/blender/blenlib/BLI_memarena.h
branches/asset-browser/source/blender/blenlib/BLI_mempool.h
branches/asset-browser/source/blender/blenlib/BLI_string.h
branches/asset-browser/source/blender/blenlib/BLI_utildefines.h
branches/asset-browser/source/blender/blenlib/intern/BLI_heap.c
branches/asset-browser/source/blender/blenlib/intern/BLI_mempool.c
branches/asset-browser/source/blender/blenlib/intern/buffer.c
branches/asset-browser/source/blender/blenlib/intern/math_matrix.c
branches/asset-browser/source/blender/blenlib/intern/scanfill.c
branches/asset-browser/source/blender/blenlib/intern/voronoi.c
branches/asset-browser/source/blender/blenloader/intern/readfile.c
branches/asset-browser/source/blender/blenloader/intern/runtime.c
branches/asset-browser/source/blender/blenloader/intern/writefile.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_construct.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_core.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_private.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_structure.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_structure.h
branches/asset-browser/source/blender/bmesh/intern/bmesh_walkers.c
branches/asset-browser/source/blender/bmesh/operators/bmo_create.c
branches/asset-browser/source/blender/bmesh/operators/bmo_edgenet.c
branches/asset-browser/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/asset-browser/source/blender/bmesh/operators/bmo_wireframe.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/asset-browser/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/asset-browser/source/blender/compositor/CMakeLists.txt
branches/asset-browser/source/blender/compositor/COM_compositor.h
branches/asset-browser/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/asset-browser/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ViewerOperation.h
branches/asset-browser/source/blender/editors/animation/keyframes_draw.c
branches/asset-browser/source/blender/editors/armature/armature_select.c
branches/asset-browser/source/blender/editors/armature/pose_transform.c
branches/asset-browser/source/blender/editors/include/UI_interface.h
branches/asset-browser/source/blender/editors/interface/interface_handlers.c
branches/asset-browser/source/blender/editors/interface/interface_layout.c
branches/asset-browser/source/blender/editors/interface/interface_ops.c
branches/asset-browser/source/blender/editors/interface/interface_templates.c
branches/asset-browser/source/blender/editors/interface/resources.c
branches/asset-browser/source/blender/editors/mask/mask_select.c
branches/asset-browser/source/blender/editors/mesh/editface.c
branches/asset-browser/source/blender/editors/mesh/editmesh_loopcut.c
branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
branches/asset-browser/source/blender/editors/mesh/editmesh_utils.c
branches/asset-browser/source/blender/editors/mesh/mesh_intern.h
branches/asset-browser/source/blender/editors/mesh/mesh_navmesh.c
branches/asset-browser/source/blender/editors/mesh/mesh_ops.c
branches/asset-browser/source/blender/editors/mesh/meshtools.c
branches/asset-browser/source/blender/editors/object/object_group.c
branches/asset-browser/source/blender/editors/object/object_hook.c
branches/asset-browser/source/blender/editors/object/object_modifier.c
branches/asset-browser/source/blender/editors/object/object_vgroup.c
branches/asset-browser/source/blender/editors/render/render_internal.c
branches/asset-browser/source/blender/editors/render/render_opengl.c
branches/asset-browser/source/blender/editors/screen/area.c
branches/asset-browser/source/blender/editors/screen/screen_edit.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_utils.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_vertex.c
branches/asset-browser/source/blender/editors/space_file/space_file.c
branches/asset-browser/source/blender/editors/space_nla/nla_buttons.c
branches/asset-browser/source/blender/editors/space_node/node_add.c
branches/asset-browser/source/blender/editors/space_node/node_edit.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_draw.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_edit.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_intern.h
branches/asset-browser/source/blender/editors/space_outliner/outliner_select.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_tools.c
branches/asset-browser/source/blender/editors/space_outliner/outliner_tree.c
branches/asset-browser/source/blender/editors/space_outliner/space_outliner.c
branches/asset-browser/source/blender/editors/space_time/space_time.c
branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
branches/asset-browser/source/blender/editors/space_view3d/drawvolume.c
branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_select.c
branches/asset-browser/source/blender/editors/transform/transform.c
branches/asset-browser/source/blender/editors/transform/transform_conversions.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/asset-browser/source/blender/freestyle/intern/application/AppView.h
branches/asset-browser/source/blender/freestyle/intern/application/Controller.h
branches/asset-browser/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/asset-browser/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/asset-browser/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/asset-browser/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/asset-browser/source/blender/freestyle/intern/geometry/BBox.h
branches/asset-browser/source/blender/freestyle/intern/geometry/FastGrid.h
branches/asset-browser/source/blender/freestyle/intern/geometry/Grid.h
branches/asset-browser/source/blender/freestyle/intern/geometry/Noise.h
branches/asset-browser/source/blender/freestyle/intern/geometry/Polygon.h
branches/asset-browser/source/blender/freestyle/intern/geometry/SweepLine.h
branches/asset-browser/source/blender/freestyle/intern/geometry/VecMat.h
branches/asset-browser/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/asset-browser/source/blender/freestyle/intern/image/GaussianFilter.h
branches/asset-browser/source/blender/freestyle/intern/image/Image.h
branches/asset-browser/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
branches/asset-browser/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/asset-browser/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/Node.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/NodeCamera.h
branches/asset-browser/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/asset-browser/source/blender/freestyle/intern/stroke/Module.h
branches/asset-browser/source/blender/freestyle/intern/stroke/Operators.h
branches/asset-browser/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/asset-browser/source/blender/freestyle/intern/stroke/Stroke.h
branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/asset-browser/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/asset-browser/source/blender/freestyle/intern/stroke/StyleModule.h
branches/asset-browser/source/blender/freestyle/intern/system/BaseIterator.h
branches/asset-browser/source/blender/freestyle/intern/system/BaseObject.h
branches/asset-browser/source/blender/freestyle/intern/system/Exception.h
branches/asset-browser/source/blender/freestyle/intern/system/Id.h
branches/asset-browser/source/blender/freestyle/intern/system/Interpreter.h
branches/asset-browser/source/blender/freestyle/intern/system/ProgressBar.h
branches/asset-browser/source/blender/freestyle/intern/system/PseudoNoise.h
branches/asset-browser/source/blender/freestyle/intern/system/RandGen.h
branches/asset-browser/source/blender/freestyle/intern/system/RenderMonitor.h
branches/asset-browser/source/blender/freestyle/intern/system/TimeStamp.h
branches/asset-browser/source/blender/freestyle/intern/system/TimeUtils.h
branches/asset-browser/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/asset-browser/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/asset-browser/source/blender/freestyle/intern/view_map/Functions1D.h
branches/asset-browser/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/asset-browser/source/blender/freestyle/intern/view_map/Interface1D.h
branches/asset-browser/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/asset-browser/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/asset-browser/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMap.h
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMapIterators.h
branches/asset-browser/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
branches/asset-browser/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
branches/asset-browser/source/blender/gpu/GPU_buffers.h
branches/asset-browser/source/blender/gpu/intern/gpu_buffers.c
branches/asset-browser/source/blender/gpu/intern/gpu_draw.c
branches/asset-browser/source/blender/imbuf/intern/colormanagement.c
branches/asset-browser/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/asset-browser/source/blender/makesdna/DNA_outliner_types.h
branches/asset-browser/source/blender/makesdna/DNA_scene_types.h
branches/asset-browser/source/blender/makesdna/DNA_space_types.h
branches/asset-browser/source/blender/makesrna/SConscript
branches/asset-browser/source/blender/makesrna/intern/CMakeLists.txt
branches/asset-browser/source/blender/makesrna/intern/SConscript
branches/asset-browser/source/blender/makesrna/intern/makesrna.c
branches/asset-browser/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/asset-browser/source/blender/makesrna/intern/rna_gpencil.c
branches/asset-browser/source/blender/makesrna/intern/rna_meta.c
branches/asset-browser/source/blender/makesrna/intern/rna_object_api.c
branches/asset-browser/source/blender/makesrna/intern/rna_render.c
branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
branches/asset-browser/source/blender/modifiers/intern/MOD_boolean_util.c
branches/asset-browser/source/blender/modifiers/intern/MOD_decimate.c
branches/asset-browser/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/asset-browser/source/blender/modifiers/intern/MOD_skin.c
branches/asset-browser/source/blender/modifiers/intern/MOD_warp.c
branches/asset-browser/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_image.c
branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_ops.c
branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/asset-browser/source/blender/python/intern/bpy_rna.c
branches/asset-browser/source/blender/render/intern/include/zbuf.h
branches/asset-browser/source/blender/render/intern/source/bake.c
branches/asset-browser/source/blender/render/intern/source/convertblender.c
branches/asset-browser/source/blender/render/intern/source/envmap.c
branches/asset-browser/source/blender/render/intern/source/initrender.c
branches/asset-browser/source/blender/render/intern/source/multires_bake.c
branches/asset-browser/source/blender/render/intern/source/occlusion.c
branches/asset-browser/source/blender/render/intern/source/pipeline.c
branches/asset-browser/source/blender/render/intern/source/pointdensity.c
branches/asset-browser/source/blender/render/intern/source/rayshade.c
branches/asset-browser/source/blender/render/intern/source/render_result.c
branches/asset-browser/source/blender/render/intern/source/render_texture.c
branches/asset-browser/source/blender/render/intern/source/shadbuf.c
branches/asset-browser/source/blender/render/intern/source/strand.c
branches/asset-browser/source/blender/render/intern/source/zbuf.c
branches/asset-browser/source/blender/windowmanager/WM_api.h
branches/asset-browser/source/blender/windowmanager/intern/wm_draw.c
branches/asset-browser/source/blender/windowmanager/intern/wm_subwindow.c
branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/asset-browser/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/asset-browser/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/asset-browser/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Camera.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Camera.h
branches/asset-browser/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_PolyProxy.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/asset-browser/source/gameengine/SceneGraph/SG_Tree.cpp
branches/asset-browser/source/gameengine/VideoTexture/BlendType.h
branches/asset-browser/source/gameengine/VideoTexture/Exception.cpp
branches/asset-browser/source/gameengine/VideoTexture/FilterSource.h
branches/asset-browser/source/gameengine/VideoTexture/ImageMix.h
branches/asset-browser/source/gameengine/VideoTexture/ImageRender.cpp
Added Paths:
-----------
branches/asset-browser/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_SplitOperation.h
Removed Paths:
-------------
branches/asset-browser/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ViewerBaseOperation.h
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/source/blender/editors/space_outliner/
Property changes on: branches/asset-browser
___________________________________________________________________
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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-58831
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:43077-44985,44987-49474,49476-59047
Modified: branches/asset-browser/CMakeLists.txt
===================================================================
--- branches/asset-browser/CMakeLists.txt 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/CMakeLists.txt 2013-08-10 12:44:49 UTC (rev 59048)
@@ -416,6 +416,10 @@
set(WITH_HEADLESS ON)
endif()
+if(NOT WITH_PYTHON)
+ set(WITH_CYCLES OFF)
+endif()
+
# enable boost for cycles, booleans, audaspace or i18n
# otherwise if the user disabled
if(NOT WITH_BOOST)
Modified: branches/asset-browser/build_files/build_environment/install_deps.sh
===================================================================
--- branches/asset-browser/build_files/build_environment/install_deps.sh 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/build_files/build_environment/install_deps.sh 2013-08-10 12:44:49 UTC (rev 59048)
@@ -237,6 +237,7 @@
# Version??
OPENCOLLADA_VERSION="1.3"
OPENCOLLADA_SOURCE="https://github.com/KhronosGroup/OpenCOLLADA.git"
+OPENCOLLADA_REPO_UID="828b60384552b83e55d2af7055f07d2c40b4d3f4"
OPENCOLLADA_FORCE_REBUILD=false
OPENCOLLADA_SKIP=false
@@ -1632,7 +1633,7 @@
compile_OpenCOLLADA() {
# To be changed each time we make edits that would modify the compiled results!
- opencollada_magic=6
+ opencollada_magic=7
_init_opencollada
# Clean install if needed!
@@ -1657,7 +1658,7 @@
git pull origin master
# Stick to same rev as windows' libs...
- git checkout e886e196673222f2f4bc32b936dc96419fff815f
+ git checkout $OPENCOLLADA_REPO_UID
git reset --hard
# Always refresh the whole build!
Modified: branches/asset-browser/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- branches/asset-browser/build_files/cmake/cmake_static_check_smatch.py 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/build_files/cmake/cmake_static_check_smatch.py 2013-08-10 12:44:49 UTC (rev 59048)
@@ -44,6 +44,7 @@
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -52,7 +53,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/asset-browser/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- branches/asset-browser/build_files/cmake/cmake_static_check_sparse.py 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/build_files/cmake/cmake_static_check_sparse.py 2013-08-10 12:44:49 UTC (rev 59048)
@@ -42,6 +42,7 @@
def main():
source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+ source_defines = project_source_info.build_defines_as_args()
check_commands = []
for c, inc_dirs, defs in source_info:
@@ -50,7 +51,8 @@
CHECKER_ARGS +
[c] +
[("-I%s" % i) for i in inc_dirs] +
- [("-D%s" % d) for d in defs]
+ [("-D%s" % d) for d in defs] +
+ source_defines
)
check_commands.append((c, cmd))
Modified: branches/asset-browser/build_files/cmake/project_source_info.py
===================================================================
--- branches/asset-browser/build_files/cmake/project_source_info.py 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/build_files/cmake/project_source_info.py 2013-08-10 12:44:49 UTC (rev 59048)
@@ -171,6 +171,26 @@
return source
+def build_defines_as_source():
+ """
+ Returns a string formatted as an include:
+ '#defines A=B\n#define....'
+ """
+ import subprocess
+ # works for both gcc and clang
+ cmd = (cmake_cache_var("CMAKE_C_COMPILER"), "-dM", "-E", "-")
+ return subprocess.Popen(cmd,
+ stdout=subprocess.PIPE,
+ stdin=subprocess.DEVNULL,
+ ).stdout.read().strip().decode('ascii')
+
+
+def build_defines_as_args():
+ return [("-D" + "=".join(l.split(maxsplit=2)[1:]))
+ for l in build_defines_as_source().split("\n")
+ if l.startswith('#define')]
+
+
# could be moved elsewhere!, this just happens to be used by scripts that also
# use this module.
def queue_processes(process_funcs, job_total=-1):
Modified: branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst 2013-08-10 12:44:49 UTC (rev 59048)
@@ -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/asset-browser/intern/cycles/CMakeLists.txt
===================================================================
--- branches/asset-browser/intern/cycles/CMakeLists.txt 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/intern/cycles/CMakeLists.txt 2013-08-10 12:44:49 UTC (rev 59048)
@@ -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/asset-browser/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/asset-browser/intern/cycles/blender/addon/ui.py 2013-08-10 12:15:59 UTC (rev 59047)
+++ branches/asset-browser/intern/cycles/blender/addon/ui.py 2013-08-10 12:44:49 UTC (rev 59048)
@@ -67,9 +67,7 @@
row.operator("render.cycles_sampling_preset_add", text="", icon="ZOOMOUT").remove_active = True
row = layout.row()
- sub = row.row()
- sub.active = (device_type == 'NONE' or cscene.device == 'CPU')
- sub.prop(cscene, "progressive")
+ row.prop(cscene, "progressive")
if not cscene.progressive:
row.prop(cscene, "squared_samples")
@@ -82,7 +80,7 @@
sub.prop(cscene, "seed")
sub.prop(cscene, "sample_clamp")
- if cscene.progressive or (device_type != 'NONE' and cscene.device == 'GPU'):
+ if cscene.progressive:
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")
@@ -355,7 +353,9 @@
col.prop(rl, "use_pass_uv")
col.prop(rl, "use_pass_object_index")
col.prop(rl, "use_pass_material_index")
+ col.separator()
col.prop(rl, "use_pass_shadow")
+ col.prop(rl, "use_pass_ambient_occlusion")
col = split.column()
col.label(text="Diffuse:")
@@ -373,10 +373,15 @@
row.prop(rl, "use_pass_transmission_direct", text="Direct", toggle=True)
row.prop(rl, "use_pass_transmission_indirect", text="Indirect", toggle=True)
row.prop(rl, "use_pass_transmission_color", text="Color", toggle=True)
-
+ col.label(text="Subsurface:")
+ row = col.row(align=True)
+ row.prop(rl, "use_pass_subsurface_direct", text="Direct", toggle=True)
+ row.prop(rl, "use_pass_subsurface_indirect", text="Indirect", toggle=True)
+ row.prop(rl, "use_pass_subsurface_color", text="Color", toggle=True)
+
+ col.separator()
col.prop(rl, "use_pass_emit", text="Emission")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list