[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27656] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r27592:27654
Campbell Barton
ideasman42 at gmail.com
Mon Mar 22 10:56:01 CET 2010
Revision: 27656
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27656
Author: campbellbarton
Date: 2010-03-22 10:55:58 +0100 (Mon, 22 Mar 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27592:27654
Modified Paths:
--------------
branches/render25/extern/lzo/minilzo/Makefile
branches/render25/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/render25/release/getversion.py
branches/render25/release/scripts/modules/bpy/__init__.py
branches/render25/release/scripts/op/wm.py
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenfont/BLF_api.h
branches/render25/source/blender/blenfont/Makefile
branches/render25/source/blender/blenfont/intern/Makefile
branches/render25/source/blender/blenfont/intern/blf.c
branches/render25/source/blender/blenfont/intern/blf_dir.c
branches/render25/source/blender/blenfont/intern/blf_font.c
branches/render25/source/blender/blenfont/intern/blf_glyph.c
branches/render25/source/blender/blenfont/intern/blf_util.c
branches/render25/source/blender/blenkernel/BKE_fcurve.h
branches/render25/source/blender/blenkernel/BKE_idprop.h
branches/render25/source/blender/blenkernel/BKE_image.h
branches/render25/source/blender/blenkernel/BKE_pointcache.h
branches/render25/source/blender/blenkernel/BKE_softbody.h
branches/render25/source/blender/blenkernel/BKE_sound.h
branches/render25/source/blender/blenkernel/intern/BME_Customdata.c
branches/render25/source/blender/blenkernel/intern/BME_conversions.c
branches/render25/source/blender/blenkernel/intern/BME_eulers.c
branches/render25/source/blender/blenkernel/intern/BME_mesh.c
branches/render25/source/blender/blenkernel/intern/BME_structure.c
branches/render25/source/blender/blenkernel/intern/BME_tools.c
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenkernel/intern/bmfont.c
branches/render25/source/blender/blenkernel/intern/boids.c
branches/render25/source/blender/blenkernel/intern/booleanops.c
branches/render25/source/blender/blenkernel/intern/booleanops_mesh.c
branches/render25/source/blender/blenkernel/intern/brush.c
branches/render25/source/blender/blenkernel/intern/bvhutils.c
branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/render25/source/blender/blenkernel/intern/cloth.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/context.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/customdata.c
branches/render25/source/blender/blenkernel/intern/deform.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/exotic.c
branches/render25/source/blender/blenkernel/intern/fcurve.c
branches/render25/source/blender/blenkernel/intern/fmodifier.c
branches/render25/source/blender/blenkernel/intern/font.c
branches/render25/source/blender/blenkernel/intern/gpencil.c
branches/render25/source/blender/blenkernel/intern/group.c
branches/render25/source/blender/blenkernel/intern/icons.c
branches/render25/source/blender/blenkernel/intern/idprop.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/implicit.c
branches/render25/source/blender/blenkernel/intern/ipo.c
branches/render25/source/blender/blenkernel/intern/key.c
branches/render25/source/blender/blenkernel/intern/lattice.c
branches/render25/source/blender/blenkernel/intern/library.c
branches/render25/source/blender/blenkernel/intern/material.c
branches/render25/source/blender/blenkernel/intern/mball.c
branches/render25/source/blender/blenkernel/intern/mesh.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/blenkernel/intern/nla.c
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/packedFile.c
branches/render25/source/blender/blenkernel/intern/paint.c
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/property.c
branches/render25/source/blender/blenkernel/intern/report.c
branches/render25/source/blender/blenkernel/intern/sca.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/script.c
branches/render25/source/blender/blenkernel/intern/seqeffects.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/shrinkwrap.c
branches/render25/source/blender/blenkernel/intern/simple_deform.c
branches/render25/source/blender/blenkernel/intern/smoke.c
branches/render25/source/blender/blenkernel/intern/softbody.c
branches/render25/source/blender/blenkernel/intern/sound.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenkernel/intern/suggestions.c
branches/render25/source/blender/blenkernel/intern/text.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenkernel/intern/world.c
branches/render25/source/blender/blenkernel/intern/writeframeserver.c
branches/render25/source/blender/blenlib/BLI_args.h
branches/render25/source/blender/blenlib/BLI_storage.h
branches/render25/source/blender/blenlib/BLI_threads.h
branches/render25/source/blender/blenlib/intern/BLI_args.c
branches/render25/source/blender/blenlib/intern/BLI_dynstr.c
branches/render25/source/blender/blenlib/intern/BLI_ghash.c
branches/render25/source/blender/blenlib/intern/BLI_heap.c
branches/render25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/render25/source/blender/blenlib/intern/BLI_kdtree.c
branches/render25/source/blender/blenlib/intern/BLI_linklist.c
branches/render25/source/blender/blenlib/intern/BLI_memarena.c
branches/render25/source/blender/blenlib/intern/BLI_mempool.c
branches/render25/source/blender/blenlib/intern/DLRB_tree.c
branches/render25/source/blender/blenlib/intern/bpath.c
branches/render25/source/blender/blenlib/intern/dynamiclist.c
branches/render25/source/blender/blenlib/intern/dynlib.c
branches/render25/source/blender/blenlib/intern/fileops.c
branches/render25/source/blender/blenlib/intern/freetypefont.c
branches/render25/source/blender/blenlib/intern/graph.c
branches/render25/source/blender/blenlib/intern/jitter.c
branches/render25/source/blender/blenlib/intern/math_base.c
branches/render25/source/blender/blenlib/intern/math_base_inline.c
branches/render25/source/blender/blenlib/intern/math_color.c
branches/render25/source/blender/blenlib/intern/math_geom.c
branches/render25/source/blender/blenlib/intern/math_matrix.c
branches/render25/source/blender/blenlib/intern/math_rotation.c
branches/render25/source/blender/blenlib/intern/math_vector.c
branches/render25/source/blender/blenlib/intern/noise.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenlib/intern/pbvh.c
branches/render25/source/blender/blenlib/intern/rct.c
branches/render25/source/blender/blenlib/intern/scanfill.c
branches/render25/source/blender/blenlib/intern/storage.c
branches/render25/source/blender/blenlib/intern/string.c
branches/render25/source/blender/blenlib/intern/threads.c
branches/render25/source/blender/blenlib/intern/time.c
branches/render25/source/blender/blenlib/intern/voxel.c
branches/render25/source/blender/blenloader/BLO_readfile.h
branches/render25/source/blender/blenloader/BLO_undofile.h
branches/render25/source/blender/blenloader/intern/readblenentry.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/undofile.c
branches/render25/source/blender/editors/animation/anim_deps.c
branches/render25/source/blender/editors/animation/anim_ipo_utils.c
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/animation/anim_ops.c
branches/render25/source/blender/editors/animation/fmodifier_ui.c
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframes_general.c
branches/render25/source/blender/editors/armature/armature_intern.h
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/armature/editarmature_retarget.c
branches/render25/source/blender/editors/armature/poseUtils.c
branches/render25/source/blender/editors/armature/reeb.c
branches/render25/source/blender/editors/armature/reeb.h
branches/render25/source/blender/editors/curve/curve_intern.h
branches/render25/source/blender/editors/curve/curve_ops.c
branches/render25/source/blender/editors/gpencil/gpencil_intern.h
branches/render25/source/blender/editors/include/BIF_glutil.h
branches/render25/source/blender/editors/include/ED_anim_api.h
branches/render25/source/blender/editors/include/ED_armature.h
branches/render25/source/blender/editors/include/ED_curve.h
branches/render25/source/blender/editors/include/ED_fileselect.h
branches/render25/source/blender/editors/include/ED_image.h
branches/render25/source/blender/editors/include/ED_info.h
branches/render25/source/blender/editors/include/ED_keyframes_edit.h
branches/render25/source/blender/editors/include/ED_markers.h
branches/render25/source/blender/editors/include/ED_mesh.h
branches/render25/source/blender/editors/include/ED_node.h
branches/render25/source/blender/editors/include/ED_numinput.h
branches/render25/source/blender/editors/include/ED_object.h
branches/render25/source/blender/editors/include/ED_screen.h
branches/render25/source/blender/editors/include/ED_screen_types.h
branches/render25/source/blender/editors/include/ED_sculpt.h
branches/render25/source/blender/editors/include/ED_sequencer.h
branches/render25/source/blender/editors/include/ED_space_api.h
branches/render25/source/blender/editors/include/ED_text.h
branches/render25/source/blender/editors/include/ED_types.h
branches/render25/source/blender/editors/include/ED_util.h
branches/render25/source/blender/editors/include/ED_uvedit.h
branches/render25/source/blender/editors/include/ED_view3d.h
branches/render25/source/blender/editors/include/UI_icons.h
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_loop.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/mesh/mesh_intern.h
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/object/object_bake.c
branches/render25/source/blender/editors/object/object_intern.h
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/physics/particle_boids.c
branches/render25/source/blender/editors/physics/particle_object.c
branches/render25/source/blender/editors/physics/physics_ops.c
branches/render25/source/blender/editors/render/render_intern.h
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/render/render_opengl.c
branches/render25/source/blender/editors/render/render_ops.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/screen_context.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/screen/screen_intern.h
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_intern.h
branches/render25/source/blender/editors/space_action/action_intern.h
branches/render25/source/blender/editors/space_action/action_ops.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_api/space.c
branches/render25/source/blender/editors/space_api/spacetypes.c
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_buttons/buttons_intern.h
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_console/console_intern.h
branches/render25/source/blender/editors/space_console/space_console.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_intern.h
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_graph/graph_buttons.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_intern.h
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_graph/graph_utils.c
branches/render25/source/blender/editors/space_graph/space_graph.c
branches/render25/source/blender/editors/space_image/image_intern.h
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_info/info_intern.h
branches/render25/source/blender/editors/space_logic/logic_intern.h
branches/render25/source/blender/editors/space_logic/space_logic.c
branches/render25/source/blender/editors/space_nla/nla_buttons.c
branches/render25/source/blender/editors/space_nla/nla_channels.c
branches/render25/source/blender/editors/space_nla/nla_draw.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_nla/nla_intern.h
branches/render25/source/blender/editors/space_nla/nla_ops.c
branches/render25/source/blender/editors/space_nla/nla_select.c
branches/render25/source/blender/editors/space_nla/space_nla.c
branches/render25/source/blender/editors/space_node/node_buttons.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_intern.h
branches/render25/source/blender/editors/space_node/node_ops.c
branches/render25/source/blender/editors/space_node/node_select.c
branches/render25/source/blender/editors/space_node/node_state.c
branches/render25/source/blender/editors/space_node/space_node.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_outliner/outliner_intern.h
branches/render25/source/blender/editors/space_outliner/outliner_ops.c
branches/render25/source/blender/editors/space_script/script_edit.c
branches/render25/source/blender/editors/space_script/script_intern.h
branches/render25/source/blender/editors/space_script/script_ops.c
branches/render25/source/blender/editors/space_script/space_script.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/render25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_sound/sound_intern.h
branches/render25/source/blender/editors/space_sound/space_sound.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_text/text_intern.h
branches/render25/source/blender/editors/space_time/time_intern.h
branches/render25/source/blender/editors/space_time/time_ops.c
branches/render25/source/blender/editors/space_userpref/space_userpref.c
branches/render25/source/blender/editors/space_userpref/userpref_intern.h
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_buttons.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_intern.h
branches/render25/source/blender/editors/space_view3d/view3d_ops.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_toolbar.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_manipulator.c
branches/render25/source/blender/editors/transform/transform_ndofinput.c
branches/render25/source/blender/editors/transform/transform_orientations.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/editors/util/ed_util.c
branches/render25/source/blender/editors/util/editmode_undo.c
branches/render25/source/blender/editors/util/undo.c
branches/render25/source/blender/editors/util/util_intern.h
branches/render25/source/blender/editors/uvedit/uvedit_intern.h
branches/render25/source/blender/imbuf/intern/IMB_radiance_hdr.h
branches/render25/source/blender/imbuf/intern/radiance_hdr.c
branches/render25/source/blender/makesdna/DNA_anim_types.h
branches/render25/source/blender/makesdna/DNA_modifier_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/intern/rna_animation_api.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_image.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/makesrna/intern/rna_wm_api.c
branches/render25/source/blender/nodes/Makefile
branches/render25/source/blender/python/generic/IDProp.c
branches/render25/source/blender/python/generic/IDProp.h
branches/render25/source/blender/python/generic/blf.c
branches/render25/source/blender/python/generic/blf.h
branches/render25/source/blender/python/intern/bpy.c
branches/render25/source/blender/python/intern/bpy.h
branches/render25/source/blender/python/intern/bpy_app.c
branches/render25/source/blender/python/intern/bpy_driver.c
branches/render25/source/blender/python/intern/bpy_interface.c
branches/render25/source/blender/python/intern/bpy_rna_callback.c
branches/render25/source/blender/python/intern/bpy_rna_callback.h
branches/render25/source/blender/python/intern/stubs.c
branches/render25/source/blender/windowmanager/Makefile
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm.c
branches/render25/source/blender/windowmanager/intern/wm_apple.c
branches/render25/source/blender/windowmanager/intern/wm_cursors.c
branches/render25/source/blender/windowmanager/intern/wm_dragdrop.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_init_exit.c
branches/render25/source/blender/windowmanager/intern/wm_jobs.c
branches/render25/source/blender/windowmanager/intern/wm_keymap.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/intern/wm_window.c
branches/render25/source/blender/windowmanager/wm.h
branches/render25/source/blender/windowmanager/wm_draw.h
branches/render25/source/blender/windowmanager/wm_event_system.h
branches/render25/source/blender/windowmanager/wm_event_types.h
branches/render25/source/blender/windowmanager/wm_files.h
branches/render25/source/blender/windowmanager/wm_window.h
branches/render25/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/render25/source/gameengine/Ketsji/KX_PythonSeq.h
branches/render25/source/gameengine/VideoTexture/Texture.cpp
Added Paths:
-----------
branches/render25/source/blender/blenkernel/intern/image_gen.c
Modified: branches/render25/extern/lzo/minilzo/Makefile
===================================================================
--- branches/render25/extern/lzo/minilzo/Makefile 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/extern/lzo/minilzo/Makefile 2010-03-22 09:55:58 UTC (rev 27656)
@@ -1,5 +1,5 @@
#
-# $Id:
+# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/render25/intern/audaspace/intern/AUD_NULLDevice.cpp
===================================================================
--- branches/render25/intern/audaspace/intern/AUD_NULLDevice.cpp 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/intern/audaspace/intern/AUD_NULLDevice.cpp 2010-03-22 09:55:58 UTC (rev 27656)
@@ -23,6 +23,8 @@
* ***** END LGPL LICENSE BLOCK *****
*/
+#include <limits>
+
#include "AUD_NULLDevice.h"
#include "AUD_IReader.h"
#include "AUD_IFactory.h"
@@ -76,7 +78,7 @@
float AUD_NULLDevice::getPosition(AUD_Handle* handle)
{
- return 0.0f;
+ return std::numeric_limits<float>::quiet_NaN();
}
AUD_Status AUD_NULLDevice::getStatus(AUD_Handle* handle)
Modified: branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-03-22 09:55:58 UTC (rev 27656)
@@ -593,6 +593,7 @@
GHOST_TSuccess GHOST_WindowCocoa::setClientWidth(GHOST_TUns32 width)
{
GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientWidth(): window invalid")
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
if (((GHOST_TUns32)cBnds.getWidth()) != width) {
@@ -601,6 +602,7 @@
size.height=cBnds.getHeight();
[m_window setContentSize:size];
}
+ [pool drain];
return GHOST_kSuccess;
}
@@ -608,6 +610,7 @@
GHOST_TSuccess GHOST_WindowCocoa::setClientHeight(GHOST_TUns32 height)
{
GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientHeight(): window invalid")
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
if (((GHOST_TUns32)cBnds.getHeight()) != height) {
@@ -616,6 +619,7 @@
size.height=height;
[m_window setContentSize:size];
}
+ [pool drain];
return GHOST_kSuccess;
}
@@ -623,6 +627,7 @@
GHOST_TSuccess GHOST_WindowCocoa::setClientSize(GHOST_TUns32 width, GHOST_TUns32 height)
{
GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setClientSize(): window invalid")
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
GHOST_Rect cBnds, wBnds;
getClientBounds(cBnds);
if ((((GHOST_TUns32)cBnds.getWidth()) != width) ||
@@ -632,6 +637,7 @@
size.height=height;
[m_window setContentSize:size];
}
+ [pool drain];
return GHOST_kSuccess;
}
@@ -1020,8 +1026,6 @@
{
static bool systemCursorVisible = true;
- NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
-
NSCursor *tmpCursor =nil;
if (visible != systemCursorVisible) {
@@ -1085,17 +1089,19 @@
};
}
[tmpCursor set];
- [pool drain];
}
GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorVisibility(bool visible)
{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]init];
+
if ([m_window isVisible]) {
loadCursor(visible, getCursorShape());
}
+ [pool drain];
return GHOST_kSuccess;
}
@@ -1146,6 +1152,8 @@
GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorShape(GHOST_TStandardCursor shape)
{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
if (m_customCursor) {
[m_customCursor release];
m_customCursor = nil;
@@ -1155,6 +1163,7 @@
loadCursor(getCursorVisibility(), shape);
}
+ [pool drain];
return GHOST_kSuccess;
}
Modified: branches/render25/release/getversion.py
===================================================================
--- branches/render25/release/getversion.py 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/release/getversion.py 2010-03-22 09:55:58 UTC (rev 27656)
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- mode: python; tab-width: 4; indent-tabs-mode: t; -*-
# vim: tabstop=4
-# $Id#
+# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
Modified: branches/render25/release/scripts/modules/bpy/__init__.py
===================================================================
--- branches/render25/release/scripts/modules/bpy/__init__.py 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/release/scripts/modules/bpy/__init__.py 2010-03-22 09:55:58 UTC (rev 27656)
@@ -50,6 +50,13 @@
if not app.debug:
_sys.stdin = None
+ # because of how the console works. we need our own help() pager func.
+ # replace the bold function because it adds crazy chars
+ import pydoc
+ pydoc.getpager = lambda: pydoc.plainpager
+ pydoc.TextDoc.bold = lambda self, text: text
+
+
# if "-d" in sys.argv: # Enable this to measure startup speed
if 0:
import cProfile
Modified: branches/render25/release/scripts/op/wm.py
===================================================================
--- branches/render25/release/scripts/op/wm.py 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/release/scripts/op/wm.py 2010-03-22 09:55:58 UTC (rev 27656)
@@ -500,7 +500,8 @@
class_name, class_prop = doc_id.split('.')
if not doc_new:
- return {'RUNNING_MODAL'}
+ self.report({'ERROR'}, "No input given for '%s'" % doc_id)
+ return {'CANCELLED'}
# check if this is an operator
op_name = class_name.upper() + '_OT_' + class_prop
@@ -517,10 +518,6 @@
print("op - old:'%s' -> new:'%s'" % (doc_orig, doc_new))
upload["title"] = 'OPERATOR %s:%s' % (doc_id, doc_orig)
- upload["description"] = doc_new
-
- self._send_xmlrpc(upload)
-
else:
rna = getattr(bpy.types, class_name).bl_rna
doc_orig = rna.properties[class_prop].description
@@ -536,9 +533,15 @@
return {'FINISHED'}
+ def draw(self, context):
+ layout = self.layout
+ props = self.properties
+ layout.label(props, text="Descriptor ID: '%s'" % props.doc_id)
+ layout.prop(props, "doc_new", text="")
+
def invoke(self, context, event):
wm = context.manager
- return wm.invoke_props_popup(self, event)
+ return wm.invoke_props_dialog(self, event, width=600)
class WM_OT_reload_scripts(bpy.types.Operator):
Modified: branches/render25/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_modifier.py 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/release/scripts/ui/properties_data_modifier.py 2010-03-22 09:55:58 UTC (rev 27656)
@@ -497,6 +497,28 @@
def PARTICLE_SYSTEM(self, layout, ob, md, wide_ui):
layout.label(text="See Particle panel.")
+ def SCREW(self, layout, ob, md, wide_ui):
+ split = layout.split()
+
+ col = split.column()
+ col.prop(md, "axis")
+ col.prop(md, "object", text="AxisOb")
+ col.prop(md, "angle")
+ col.prop(md, "steps")
+ col.prop(md, "render_steps")
+
+ col = split.column()
+ row = col.row()
+ row.active = (md.object is None or md.use_object_screw_offset == False)
+ row.prop(md, "screw_offset")
+ row = col.row()
+ row.active = (md.object is not None)
+ row.prop(md, "use_object_screw_offset")
+ col.prop(md, "use_normal_calculate")
+ col.prop(md, "use_normal_flip")
+ col.prop(md, "iterations")
+
+
def SHRINKWRAP(self, layout, ob, md, wide_ui):
split = layout.split()
col = split.column()
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-03-22 09:55:58 UTC (rev 27656)
@@ -471,8 +471,8 @@
layout.separator()
- layout.operator("mesh.select_random", text="Random...")
- layout.operator("mesh.select_nth", text="Select Nth...")
+ layout.operator("mesh.select_random", text="Random")
+ layout.operator("mesh.select_nth", text="Every N Number of Verts")
layout.operator("mesh.edges_select_sharp", text="Sharp Edges")
layout.operator("mesh.faces_select_linked_flat", text="Linked Flat Faces")
layout.operator("mesh.faces_select_interior", text="Interior Faces")
@@ -482,8 +482,10 @@
layout.operator("mesh.select_by_number_vertices", text="Triangles").type = 'TRIANGLES'
layout.operator("mesh.select_by_number_vertices", text="Quads").type = 'QUADS'
+ if context.scene.tool_settings.mesh_selection_mode[2] == False:
+ layout.operator("mesh.select_non_manifold", text="Non Manifold")
layout.operator("mesh.select_by_number_vertices", text="Loose Verts/Edges").type = 'OTHER'
- layout.operator("mesh.select_similar", text="Similar...")
+ layout.operator("mesh.select_similar", text="Similar")
layout.separator()
Modified: branches/render25/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/render25/source/blender/blenfont/BLF_api.h 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/source/blender/blenfont/BLF_api.h 2010-03-22 09:55:58 UTC (rev 27656)
@@ -1,5 +1,5 @@
/**
- * $Id:
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
Modified: branches/render25/source/blender/blenfont/Makefile
===================================================================
--- branches/render25/source/blender/blenfont/Makefile 2010-03-22 09:30:00 UTC (rev 27655)
+++ branches/render25/source/blender/blenfont/Makefile 2010-03-22 09:55:58 UTC (rev 27656)
@@ -1,5 +1,5 @@
#
-# $Id:
+# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
Modified: branches/render25/source/blender/blenfont/intern/Makefile
===================================================================
--- branches/render25/source/blender/blenfont/intern/Makefile 2010-03-22 09:30:00 UTC (rev 27655)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list