[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49477] branches/asset-browser: merge from trunk: rev.
Andrea Weikert
elubie at gmx.net
Wed Aug 1 21:21:16 CEST 2012
Revision: 49477
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49477
Author: elubie
Date: 2012-08-01 19:21:15 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
merge from trunk: rev. 49326-49474
Modified Paths:
--------------
branches/asset-browser/doc/python_api/examples/bpy.ops.2.py
branches/asset-browser/doc/python_api/rst/info_best_practice.rst
branches/asset-browser/doc/python_api/sphinx_doc_gen.py
branches/asset-browser/extern/bullet2/readme.txt
branches/asset-browser/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/asset-browser/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/asset-browser/extern/libmv/libmv/simple_pipeline/detect.cc
branches/asset-browser/extern/recastnavigation/Recast/Source/RecastContour.cpp
branches/asset-browser/extern/recastnavigation/Recast/Source/RecastMesh.cpp
branches/asset-browser/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/asset-browser/intern/audaspace/FX/AUD_ButterworthFactory.h
branches/asset-browser/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
branches/asset-browser/intern/audaspace/FX/AUD_FaderFactory.h
branches/asset-browser/intern/audaspace/intern/AUD_3DMath.h
branches/asset-browser/intern/audaspace/intern/AUD_C-API.h
branches/asset-browser/intern/boolop/intern/BOP_BSPNode.h
branches/asset-browser/intern/boolop/intern/BOP_BSPTree.h
branches/asset-browser/intern/cycles/bvh/bvh.cpp
branches/asset-browser/intern/cycles/device/device_opencl.cpp
branches/asset-browser/intern/cycles/kernel/kernel_montecarlo.h
branches/asset-browser/intern/cycles/kernel/kernel_path.h
branches/asset-browser/intern/cycles/render/image.cpp
branches/asset-browser/intern/cycles/render/light.cpp
branches/asset-browser/intern/cycles/render/object.cpp
branches/asset-browser/intern/cycles/util/util_cache.cpp
branches/asset-browser/intern/cycles/util/util_path.cpp
branches/asset-browser/intern/ghost/GHOST_IWindow.h
branches/asset-browser/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/asset-browser/intern/guardedalloc/MEM_guardedalloc.h
branches/asset-browser/intern/guardedalloc/intern/mallocn.c
branches/asset-browser/intern/raskter/raskter.c
branches/asset-browser/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/check_po.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/clean_po.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/import_po_from_branches.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/merge_po.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/rtl_preprocess.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/settings.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/update_branches.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/update_mo.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/update_po.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/update_pot.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/update_trunk.py
branches/asset-browser/release/scripts/modules/bl_i18n_utils/utils.py
branches/asset-browser/release/scripts/modules/bpy/utils.py
branches/asset-browser/release/scripts/modules/console_python.py
branches/asset-browser/release/scripts/modules/sys_info.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_data_armature.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_game.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_mask_common.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_material.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_object.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_common.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_field.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_scene.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_texture.py
branches/asset-browser/release/scripts/startup/bl_ui/properties_world.py
branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
branches/asset-browser/release/scripts/startup/bl_ui/space_node.py
branches/asset-browser/release/scripts/startup/bl_ui/space_sequencer.py
branches/asset-browser/release/scripts/startup/bl_ui/space_text.py
branches/asset-browser/release/scripts/startup/bl_ui/space_time.py
branches/asset-browser/release/scripts/startup/bl_ui/space_userpref.py
branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
branches/asset-browser/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/asset-browser/source/blender/avi/intern/avi.c
branches/asset-browser/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/asset-browser/source/blender/blenkernel/BKE_mask.h
branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
branches/asset-browser/source/blender/blenkernel/BKE_node.h
branches/asset-browser/source/blender/blenkernel/BKE_tracking.h
branches/asset-browser/source/blender/blenkernel/intern/boids.c
branches/asset-browser/source/blender/blenkernel/intern/brush.c
branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.c
branches/asset-browser/source/blender/blenkernel/intern/colortools.c
branches/asset-browser/source/blender/blenkernel/intern/constraint.c
branches/asset-browser/source/blender/blenkernel/intern/context.c
branches/asset-browser/source/blender/blenkernel/intern/displist.c
branches/asset-browser/source/blender/blenkernel/intern/library.c
branches/asset-browser/source/blender/blenkernel/intern/mask.c
branches/asset-browser/source/blender/blenkernel/intern/mask_rasterize.c
branches/asset-browser/source/blender/blenkernel/intern/mesh.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/node.c
branches/asset-browser/source/blender/blenkernel/intern/ocean.c
branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
branches/asset-browser/source/blender/blenkernel/intern/tracking.c
branches/asset-browser/source/blender/blenkernel/intern/writeframeserver.c
branches/asset-browser/source/blender/blenlib/BLI_memarena.h
branches/asset-browser/source/blender/blenlib/intern/BLI_args.c
branches/asset-browser/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/asset-browser/source/blender/blenlib/intern/DLRB_tree.c
branches/asset-browser/source/blender/blenlib/intern/bpath.c
branches/asset-browser/source/blender/blenlib/intern/math_base_inline.c
branches/asset-browser/source/blender/blenlib/intern/pbvh.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/versioning_legacy.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_interp.c
branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.c
branches/asset-browser/source/blender/bmesh/operators/bmo_utils.c
branches/asset-browser/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BokehImageNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_BrightnessNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ColorNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_CompositorNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_GammaNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_IDMaskNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_InvertNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_MuteNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_MuteNode.h
branches/asset-browser/source/blender/compositor/nodes/COM_TimeNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_TonemapNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ValueNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
branches/asset-browser/source/blender/compositor/nodes/COM_ViewerNode.cpp
branches/asset-browser/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_CompositorOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ImageOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_KeyingScreenOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_MaskOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_MovieClipOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_OutputFileOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_PreviewOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_TextureOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_TextureOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/asset-browser/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/asset-browser/source/blender/compositor/operations/COM_ViewerBaseOperation.h
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/armature/editarmature_retarget.c
branches/asset-browser/source/blender/editors/include/ED_image.h
branches/asset-browser/source/blender/editors/include/ED_mask.h
branches/asset-browser/source/blender/editors/include/ED_node.h
branches/asset-browser/source/blender/editors/include/ED_object.h
branches/asset-browser/source/blender/editors/interface/interface.c
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_panel.c
branches/asset-browser/source/blender/editors/interface/interface_regions.c
branches/asset-browser/source/blender/editors/interface/interface_widgets.c
branches/asset-browser/source/blender/editors/mask/mask_add.c
branches/asset-browser/source/blender/editors/mask/mask_draw.c
branches/asset-browser/source/blender/editors/mask/mask_ops.c
branches/asset-browser/source/blender/editors/mask/mask_select.c
branches/asset-browser/source/blender/editors/mesh/editmesh_knife.c
branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
branches/asset-browser/source/blender/editors/object/object_modifier.c
branches/asset-browser/source/blender/editors/screen/glutil.c
branches/asset-browser/source/blender/editors/screen/screen_ops.c
branches/asset-browser/source/blender/editors/sculpt_paint/paint_image.c
branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
branches/asset-browser/source/blender/editors/space_action/space_action.c
branches/asset-browser/source/blender/editors/space_clip/clip_draw.c
branches/asset-browser/source/blender/editors/space_clip/clip_editor.c
branches/asset-browser/source/blender/editors/space_clip/clip_intern.h
branches/asset-browser/source/blender/editors/space_clip/clip_ops.c
branches/asset-browser/source/blender/editors/space_clip/clip_toolbar.c
branches/asset-browser/source/blender/editors/space_clip/clip_utils.c
branches/asset-browser/source/blender/editors/space_clip/tracking_ops.c
branches/asset-browser/source/blender/editors/space_clip/tracking_select.c
branches/asset-browser/source/blender/editors/space_image/image_edit.c
branches/asset-browser/source/blender/editors/space_image/image_ops.c
branches/asset-browser/source/blender/editors/space_image/space_image.c
branches/asset-browser/source/blender/editors/space_logic/logic_ops.c
branches/asset-browser/source/blender/editors/space_nla/nla_edit.c
branches/asset-browser/source/blender/editors/space_node/drawnode.c
branches/asset-browser/source/blender/editors/space_node/node_draw.c
branches/asset-browser/source/blender/editors/space_node/node_edit.c
branches/asset-browser/source/blender/editors/space_node/node_ops.c
branches/asset-browser/source/blender/editors/space_node/node_select.c
branches/asset-browser/source/blender/editors/space_sequencer/sequencer_draw.c
branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_edit.c
branches/asset-browser/source/blender/editors/space_view3d/view3d_fly.c
branches/asset-browser/source/blender/editors/transform/transform.c
branches/asset-browser/source/blender/editors/transform/transform_snap.c
branches/asset-browser/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/asset-browser/source/blender/gpu/GPU_draw.h
branches/asset-browser/source/blender/gpu/intern/gpu_draw.c
branches/asset-browser/source/blender/ikplugin/intern/iksolver_plugin.c
branches/asset-browser/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/asset-browser/source/blender/imbuf/intern/divers.c
branches/asset-browser/source/blender/makesdna/DNA_ID.h
branches/asset-browser/source/blender/makesdna/DNA_mask_types.h
branches/asset-browser/source/blender/makesdna/DNA_node_types.h
branches/asset-browser/source/blender/makesdna/DNA_space_types.h
branches/asset-browser/source/blender/makesdna/intern/makesdna.c
branches/asset-browser/source/blender/makesrna/intern/rna_access.c
branches/asset-browser/source/blender/makesrna/intern/rna_cloth.c
branches/asset-browser/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/asset-browser/source/blender/makesrna/intern/rna_main.c
branches/asset-browser/source/blender/makesrna/intern/rna_mask.c
branches/asset-browser/source/blender/makesrna/intern/rna_nla.c
branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
branches/asset-browser/source/blender/makesrna/intern/rna_object_api.c
branches/asset-browser/source/blender/makesrna/intern/rna_rna.c
branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
branches/asset-browser/source/blender/makesrna/intern/rna_space.c
branches/asset-browser/source/blender/modifiers/intern/MOD_ocean.c
branches/asset-browser/source/blender/modifiers/intern/MOD_simpledeform.c
branches/asset-browser/source/blender/modifiers/intern/MOD_skin.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_common.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/asset-browser/source/blender/render/extern/include/RE_pipeline.h
branches/asset-browser/source/blender/render/intern/raytrace/bvh.h
branches/asset-browser/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/asset-browser/source/blender/render/intern/source/imagetexture.c
branches/asset-browser/source/blender/render/intern/source/pipeline.c
branches/asset-browser/source/blender/render/intern/source/rayshade.c
branches/asset-browser/source/blender/render/intern/source/render_texture.c
branches/asset-browser/source/blender/render/intern/source/rendercore.c
branches/asset-browser/source/blender/render/intern/source/shadbuf.c
branches/asset-browser/source/blender/render/intern/source/sss.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_event_system.c
branches/asset-browser/source/blender/windowmanager/intern/wm_files.c
branches/asset-browser/source/blender/windowmanager/intern/wm_init_exit.c
branches/asset-browser/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.cpp
branches/asset-browser/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/asset-browser/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/asset-browser/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/asset-browser/source/gameengine/Ketsji/BL_Texture.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_Light.cpp
branches/asset-browser/source/gameengine/Ketsji/KX_RadarSensor.h
branches/asset-browser/source/gameengine/Ketsji/KX_Scene.h
branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/asset-browser/source/gameengine/Physics/common/PHY_DynamicTypes.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_IRenderTools.h
branches/asset-browser/source/tools/check_style_c.py
branches/asset-browser/source/tools/spell_check_source.py
Property Changed:
----------------
branches/asset-browser/
branches/asset-browser/source/blender/editors/interface/interface.c
branches/asset-browser/source/blender/editors/space_outliner/
Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:43077-44985,44987-49325
+ /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:43077-44985,44987-49474
Modified: branches/asset-browser/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- branches/asset-browser/doc/python_api/examples/bpy.ops.2.py 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/doc/python_api/examples/bpy.ops.2.py 2012-08-01 19:21:15 UTC (rev 49477)
@@ -19,4 +19,4 @@
# group add popup
import bpy
-bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
\ No newline at end of file
+bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
Modified: branches/asset-browser/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_best_practice.rst 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/doc/python_api/rst/info_best_practice.rst 2012-08-01 19:21:15 UTC (rev 49477)
@@ -56,9 +56,71 @@
User Interface Layout
=====================
-TODO: Thomas
+Some notes to keep in mind when writing UI layouts:
+* UI code is quite simple. Layout declarations are there to easily create a decent layout.
+ General rule here: If you need more code for the layout declaration, then for the actual properties, you do it wrong.
+
+Example layouts:
+
+* layout()
+
+ The basic layout is a simple Top -> Bottom layout.
+
+ .. code-block:: python
+
+ layout.prop()
+ layout.prop()
+
+* layout.row()
+
+ Use row(), when you want more than 1 propertey in one line.
+
+ .. code-block:: python
+
+ row = layout.row()
+ row.prop()
+ row.prop()
+
+* layout.column()
+
+ Use column(), when you want your properties in a column.
+
+ .. code-block:: python
+
+ col = layout.column()
+ col.prop()
+ col.prop()
+
+* layout.split()
+
+ This can be used to create more complex layouts. For example you can split the layout and create two column() layouts next to each other.
+ Don't use split, when you simply want two properties in a row. Use row() for that.
+
+ .. code-block:: python
+
+ split = layout.split()
+
+ col = split.column()
+ col.prop()
+ col.prop()
+
+ col = split.column()
+ col.prop()
+ col.prop()
+
+Declaration names:
+
+Try to only use these variable names for layout declarations:
+
+* row for a row() layout
+* col for a column() layout
+* split for a split() layout
+* flow for a column_flow() layout
+* sub for a sub layout (a column inside a column for example)
+
+
Script Efficiency
=================
Modified: branches/asset-browser/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/asset-browser/doc/python_api/sphinx_doc_gen.py 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/doc/python_api/sphinx_doc_gen.py 2012-08-01 19:21:15 UTC (rev 49477)
@@ -971,6 +971,7 @@
"meta_ball": ("MetaBall", False),
"object": ("Object", False),
"particle_edit_object": ("Object", False),
+ "particle_settings": ("ParticleSettings", False),
"particle_system": ("ParticleSystem", False),
"particle_system_editable": ("ParticleSystem", False),
"pose_bone": ("PoseBone", False),
Modified: branches/asset-browser/extern/bullet2/readme.txt
===================================================================
--- branches/asset-browser/extern/bullet2/readme.txt 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/extern/bullet2/readme.txt 2012-08-01 19:21:15 UTC (rev 49477)
@@ -13,3 +13,7 @@
Apply patches/make_id.patch to prevent duplicated define of MAKE_ID macro in blender
side and bullet side.
Sergey
+
+Apply patches/ghost_character.path to prevent characters from colliding with ghost objects.
+Mitchell
+
Modified: branches/asset-browser/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
===================================================================
--- branches/asset-browser/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp 2012-08-01 19:21:15 UTC (rev 49477)
@@ -77,6 +77,9 @@
if (convexResult.m_hitCollisionObject == m_me)
return btScalar(1.0);
+ if (!convexResult.m_hitCollisionObject->hasContactResponse())
+ return btScalar(1.0);
+
btVector3 hitNormalWorld;
if (normalInWorldSpace)
{
@@ -173,7 +176,12 @@
m_manifoldArray.resize(0);
btBroadphasePair* collisionPair = &m_ghostObject->getOverlappingPairCache()->getOverlappingPairArray()[i];
-
+ btCollisionObject* obj0 = static_cast<btCollisionObject*>(collisionPair->m_pProxy0->m_clientObject);
+ btCollisionObject* obj1 = static_cast<btCollisionObject*>(collisionPair->m_pProxy1->m_clientObject);
+
+ if ((obj0 && !obj0->hasContactResponse()) || (obj1 && !obj1->hasContactResponse()))
+ continue;
+
if (collisionPair->m_algorithm)
collisionPair->m_algorithm->getAllContactManifolds(m_manifoldArray);
Modified: branches/asset-browser/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
===================================================================
--- branches/asset-browser/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2012-08-01 19:21:15 UTC (rev 49477)
@@ -209,7 +209,7 @@
if( ix >= width-2 ) ix = width-2;
if( iy >= height-2 ) iy = height-2;
- Offset offset = { ix-x, iy-y, fx, fy };
+ Offset offset = { (short)(ix-x), (short)(iy-y), (unsigned char)fx, (unsigned char)fy };
grid->offset[y*width+x] = offset;
}
}
Modified: branches/asset-browser/extern/libmv/libmv/simple_pipeline/detect.cc
===================================================================
--- branches/asset-browser/extern/libmv/libmv/simple_pipeline/detect.cc 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/extern/libmv/libmv/simple_pipeline/detect.cc 2012-08-01 19:21:15 UTC (rev 49477)
@@ -66,7 +66,7 @@
Feature *all_features = new Feature[num_features];
for(int i = 0; i < num_features; ++i) {
- Feature a = { nonmax[i].x, nonmax[i].y, scores[i], 0 };
+ Feature a = { (float)nonmax[i].x, (float)nonmax[i].y, (float)scores[i], 0 };
all_features[i] = a;
}
@@ -173,7 +173,7 @@
for(int y=16; y<height-16; y++) {
for(int x=16; x<width-16; x++) {
int s = scores[y*width+x];
- Feature f = { x+8, y+8, s, 16 };
+ Feature f = { (float)x+8.0f, (float)y+8.0f, (float)s, 16 };
if(s>min) detected[i++] = f;
}
}
Modified: branches/asset-browser/extern/recastnavigation/Recast/Source/RecastContour.cpp
===================================================================
--- branches/asset-browser/extern/recastnavigation/Recast/Source/RecastContour.cpp 2012-08-01 19:11:17 UTC (rev 49476)
+++ branches/asset-browser/extern/recastnavigation/Recast/Source/RecastContour.cpp 2012-08-01 19:21:15 UTC (rev 49477)
@@ -321,7 +321,7 @@
// Find maximum deviation from the segment.
float maxd = 0;
- int maxi = -1;
+ int i_max = -1;
int ci, cinc, endi;
// Traverse the segment in lexilogical order so that the
@@ -350,7 +350,7 @@
if (d > maxd)
{
maxd = d;
- maxi = ci;
+ i_max = ci;
}
ci = (ci+cinc) % pn;
}
@@ -359,7 +359,7 @@
// If the max deviation is larger than accepted error,
// add new point, else continue to next segment.
- if (maxi != -1 && maxd > (maxError*maxError))
+ if (i_max != -1 && maxd > (maxError*maxError))
{
// Add space for the new point.
simplified.resize(simplified.size()+4);
@@ -372,10 +372,10 @@
simplified[j*4+3] = simplified[(j-1)*4+3];
}
// Add the point.
- simplified[(i+1)*4+0] = points[maxi*4+0];
- simplified[(i+1)*4+1] = points[maxi*4+1];
- simplified[(i+1)*4+2] = points[maxi*4+2];
- simplified[(i+1)*4+3] = maxi;
+ simplified[(i+1)*4+0] = points[i_max*4+0];
+ simplified[(i+1)*4+1] = points[i_max*4+1];
+ simplified[(i+1)*4+2] = points[i_max*4+2];
+ simplified[(i+1)*4+3] = i_max;
}
else
{
@@ -399,7 +399,7 @@
const int bi = simplified[ii*4+3];
// Find maximum deviation from the segment.
- int maxi = -1;
+ int i_max = -1;
int ci = (ai+1) % pn;
// Tessellate only outer edges or edges between areas.
@@ -423,19 +423,19 @@
if (bx > ax || (bx == ax && bz > az))
{
const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
- maxi = (ai + n/2) % pn;
+ i_max = (ai + n/2) % pn;
}
else
{
const int n = bi < ai ? (bi+pn - ai) : (bi - ai);
- maxi = (ai + (n+1)/2) % pn;
+ i_max = (ai + (n+1)/2) % pn;
}
}
}
// If the max deviation is larger than accepted error,
// add new point, else continue to next segment.
- if (maxi != -1)
+ if (i_max != -1)
{
// Add space for the new point.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list