[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59752] branches/soc-2013-dingto: Merged revision(s) 59605-59750 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Mon Sep 2 21:35:58 CEST 2013
Revision: 59752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59752
Author: dingto
Date: 2013-09-02 19:35:58 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
Merged revision(s) 59605-59750 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/CMakeLists.txt
branches/soc-2013-dingto/build_files/cmake/macros.cmake
branches/soc-2013-dingto/intern/atomic/atomic_ops.h
branches/soc-2013-dingto/intern/cycles/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/SConscript
branches/soc-2013-dingto/intern/cycles/app/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-dingto/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-dingto/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_session.cpp
branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-dingto/intern/cycles/cmake/external_libs.cmake
branches/soc-2013-dingto/intern/cycles/device/device.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cpu.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
branches/soc-2013-dingto/intern/cycles/device/device_memory.h
branches/soc-2013-dingto/intern/cycles/device/device_multi.cpp
branches/soc-2013-dingto/intern/cycles/device/device_network.cpp
branches/soc-2013-dingto/intern/cycles/device/device_network.h
branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp
branches/soc-2013-dingto/intern/cycles/device/device_task.cpp
branches/soc-2013-dingto/intern/cycles/device/device_task.h
branches/soc-2013-dingto/intern/cycles/kernel/closure/bssrdf.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cl
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel.cu
branches/soc-2013-dingto/intern/cycles/kernel/kernel.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_film.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_types.h
branches/soc-2013-dingto/intern/cycles/render/buffers.cpp
branches/soc-2013-dingto/intern/cycles/render/buffers.h
branches/soc-2013-dingto/intern/cycles/render/image.cpp
branches/soc-2013-dingto/intern/cycles/render/integrator.cpp
branches/soc-2013-dingto/intern/cycles/render/nodes.cpp
branches/soc-2013-dingto/intern/cycles/render/session.cpp
branches/soc-2013-dingto/intern/cycles/render/session.h
branches/soc-2013-dingto/intern/cycles/render/sky_model.cpp
branches/soc-2013-dingto/intern/cycles/util/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/util/util_task.cpp
branches/soc-2013-dingto/intern/cycles/util/util_task.h
branches/soc-2013-dingto/intern/cycles/util/util_types.h
branches/soc-2013-dingto/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2013-dingto/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-dingto/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-dingto/intern/guardedalloc/intern/mmap_win.c
branches/soc-2013-dingto/intern/guardedalloc/mmap_win.h
branches/soc-2013-dingto/intern/opencolorio/fallback_impl.cc
branches/soc-2013-dingto/intern/opencolorio/ocio_capi.cc
branches/soc-2013-dingto/intern/opencolorio/ocio_capi.h
branches/soc-2013-dingto/intern/opencolorio/ocio_impl.h
branches/soc-2013-dingto/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-dingto/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-dingto/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-dingto/release/scripts/templates_py/ui_list.py
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_editmesh_bvh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_lamp.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_library.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_report.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_text.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/boids.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/bpath.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.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/editmesh_bvh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/screen.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/text.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_dynstr.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_jitter.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_kdtree.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_lasso.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_geom.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_path_util.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-dingto/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2013-dingto/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/gsqueue.c
branches/soc-2013-dingto/source/blender/blenlib/intern/lasso.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/blenlib/intern/path_util.c
branches/soc-2013-dingto/source/blender/blenlib/intern/quadric.c
branches/soc-2013-dingto/source/blender/blenlib/intern/rand.c
branches/soc-2013-dingto/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-dingto/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_inline.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operator_api.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-dingto/source/blender/editors/curve/curve_intern.h
branches/soc-2013-dingto/source/blender/editors/curve/curve_ops.c
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/include/ED_curve.h
branches/soc-2013-dingto/source/blender/editors/include/ED_object.h
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.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/object/object_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_relations.c
branches/soc-2013-dingto/source/blender/editors/physics/particle_edit.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/render/render_preview.c
branches/soc-2013-dingto/source/blender/editors/screen/glutil.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_graph_ops.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-dingto/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-dingto/source/blender/editors/space_file/filelist.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_intern.h
branches/soc-2013-dingto/source/blender/editors/space_node/node_ops.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_view.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-dingto/source/blender/editors/space_text/text_draw.c
branches/soc-2013-dingto/source/blender/editors/space_text/text_intern.h
branches/soc-2013-dingto/source/blender/editors/space_text/text_ops.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-dingto/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_screen_types.h
branches/soc-2013-dingto/source/blender/makesdna/intern/SConscript
branches/soc-2013-dingto/source/blender/makesrna/RNA_access.h
branches/soc-2013-dingto/source/blender/makesrna/RNA_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_array.c
branches/soc-2013-dingto/source/blender/nodes/NOD_composite.h
branches/soc-2013-dingto/source/blender/nodes/NOD_shader.h
branches/soc-2013-dingto/source/blender/nodes/NOD_texture.h
branches/soc-2013-dingto/source/blender/nodes/intern/node_util.c
branches/soc-2013-dingto/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2013-dingto/source/blender/nodes/shader/node_shader_util.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.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/WM_types.h
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-dingto/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-dingto/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
Added Paths:
-----------
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-dingto/release/scripts/templates_py/ui_list_simple.py
branches/soc-2013-dingto/source/blender/blenlib/BLI_compiler_attrs.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_strict_flags.h
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_bisect.c
Removed Paths:
-------------
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.py
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604
+ /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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-59750
Modified: branches/soc-2013-dingto/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/CMakeLists.txt 2013-09-02 19:28:44 UTC (rev 59751)
+++ branches/soc-2013-dingto/CMakeLists.txt 2013-09-02 19:35:58 UTC (rev 59752)
@@ -262,6 +262,7 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 CACHE STRING "CUDA architectures to build binaries for")
@@ -881,8 +882,6 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
Modified: branches/soc-2013-dingto/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-09-02 19:28:44 UTC (rev 59751)
+++ branches/soc-2013-dingto/build_files/cmake/macros.cmake 2013-09-02 19:35:58 UTC (rev 59752)
@@ -387,7 +387,7 @@
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
- target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
endmacro()
macro(TEST_SSE_SUPPORT
Copied: branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.1.py (from rev 59750, trunk/blender/doc/python_api/examples/bpy.types.UIList.1.py)
===================================================================
--- branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.1.py (rev 0)
+++ branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.1.py 2013-09-02 19:35:58 UTC (rev 59752)
@@ -0,0 +1,93 @@
+"""
+Basic UIList Example
++++++++++++++++++++
+This script is the UIList subclass used to show material slots, with a bunch of additional commentaries.
+
+Notice the name of the class, this naming convention is similar as the one for panels or menus.
+
+.. note::
+
+ UIList subclasses must be registered for blender to use them.
+"""
+import bpy
+
+
+class MATERIAL_UL_matslots_example(bpy.types.UIList):
+ # The draw_item function is called for each item of the collection that is visible in the list.
+ # data is the RNA object containing the collection,
+ # item is the current drawn item of the collection,
+ # icon is the "computed" icon for the item (as an integer, because some objects like materials or textures
+ # have custom icons ID, which are not available as enum items).
+ # active_data is the RNA object containing the active property for the collection (i.e. integer pointing to the
+ # active item of the collection).
+ # active_propname is the name of the active property (use 'getattr(active_data, active_propname)').
+ # index is index of the current item in the collection.
+ # flt_flag is the result of the filtering process for this item.
+ # Note: as index and flt_flag are optional arguments, you do not have to use/declare them here if you don't
+ # need them.
+ def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+ ob = data
+ slot = item
+ ma = slot.material
+ # draw_item must handle the three layout types... Usually 'DEFAULT' and 'COMPACT' can share the same code.
+ if self.layout_type in {'DEFAULT', 'COMPACT'}:
+ # You should always start your row layout by a label (icon + text), this will also make the row easily
+ # selectable in the list!
+ # We use icon_value of label, as our given icon is an integer value, not an enum ID.
+ # Note "data" names should never be translated!
+ layout.label(text=ma.name if ma else "", translate=False, icon_value=icon)
+ # And now we can add other UI stuff...
+ # Here, we add nodes info if this material uses (old!) shading nodes.
+ if ma and not context.scene.render.use_shading_nodes:
+ manode = ma.active_node_material
+ if manode:
+ # The static method UILayout.icon returns the integer value of the icon ID "computed" for the given
+ # RNA object.
+ layout.label(text="Node %s" % manode.name, translate=False, icon_value=layout.icon(manode))
+ elif ma.use_nodes:
+ layout.label(text="Node <none>", translate=False)
+ else:
+ layout.label(text="")
+ # 'GRID' layout type should be as compact as possible (typically a single icon!).
+ elif self.layout_type in {'GRID'}:
+ layout.alignment = 'CENTER'
+ layout.label(text="", icon_value=icon)
+
+
+# And now we can use this list everywhere in Blender. Here is a small example panel.
+class UIListPanelExample(bpy.types.Panel):
+ """Creates a Panel in the Object properties window"""
+ bl_label = "UIList Panel"
+ bl_idname = "OBJECT_PT_ui_list_example"
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
+ bl_context = "object"
+
+ def draw(self, context):
+ layout = self.layout
+
+ obj = context.object
+
+ # template_list now takes two new args.
+ # The first one is the identifier of the registered UIList to use (if you want only the default list,
+ # with no custom draw code, use "UI_UL_list").
+ layout.template_list("MATERIAL_UL_matslots_example", "", obj, "material_slots", obj, "active_material_index")
+
+ # The second one can usually be left as an empty string. It's an additional ID used to distinguish lists in case you
+ # use the same list several times in a given area.
+ layout.template_list("MATERIAL_UL_matslots_example", "compact", obj, "material_slots",
+ obj, "active_material_index", type='COMPACT')
+
+
+def register():
+ bpy.utils.register_class(MATERIAL_UL_matslots_example)
+ bpy.utils.register_class(UIListPanelExample)
+
+
+def unregister():
+ bpy.utils.unregister_class(MATERIAL_UL_matslots_example)
+ bpy.utils.unregister_class(UIListPanelExample)
+
+
+if __name__ == "__main__":
+ register()
Copied: branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.2.py (from rev 59750, trunk/blender/doc/python_api/examples/bpy.types.UIList.2.py)
===================================================================
--- branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.2.py (rev 0)
+++ branches/soc-2013-dingto/doc/python_api/examples/bpy.types.UIList.2.py 2013-09-02 19:35:58 UTC (rev 59752)
@@ -0,0 +1,160 @@
+"""
+Advanced UIList Example - Filtering and Reordering
+++++++++++++++++++++++++++++++++++++++++++++++++++
+This script is an extended version of the UIList subclass used to show vertex groups. It is not used 'as is',
+because iterating over all vertices in a 'draw' function is a very bad idea for UI performances! However, it's a good
+example of how to create/use filtering/reordering callbacks.
+"""
+import bpy
+
+
+class MESH_UL_vgroups_slow(UIList):
+ # Constants (flags)
+ # Be careful not to shadow FILTER_ITEM!
+ VGROUP_EMPTY = 1 << 0
+
+ # Custom properties, saved with .blend file.
+ use_filter_empty = bpy.props.BoolProperty(name="Filter Empty", default=False, options=set(),
+ description="Whether to filter empty vertex groups")
+ use_filter_empty_reverse = bpy.props.BoolProperty(name="Reverse Empty", default=False, options=set(),
+ description="Reverse empty filtering")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list