[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36606] branches/bmesh/blender: svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Wed May 11 02:19:14 CEST 2011
Revision: 36606
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36606
Author: campbellbarton
Date: 2011-05-11 00:19:13 +0000 (Wed, 11 May 2011)
Log Message:
-----------
svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36583
Modified Paths:
--------------
branches/bmesh/blender/build_files/cmake/packaging.cmake
branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_dir.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal.h
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenlib/intern/rand.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/object/object_transform.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
branches/bmesh/blender/source/blender/editors/util/util_intern.h
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/bmesh/blender/source/blender/imbuf/intern/cineon/cineonfile.h
branches/bmesh/blender/source/blender/imbuf/intern/cineon/cineonlib.c
branches/bmesh/blender/source/blender/imbuf/intern/cineon/logmemfile.c
branches/bmesh/blender/source/blender/makesdna/DNA_camera_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_rgb.c
branches/bmesh/blender/source/blender/python/generic/IDProp.c
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
branches/bmesh/blender/source/blender/render/intern/include/shading.h
branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
branches/bmesh/blender/source/blender/render/intern/source/renderdatabase.c
branches/bmesh/blender/source/blender/render/intern/source/strand.c
branches/bmesh/blender/source/blender/render/intern/source/sunsky.c
branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
branches/bmesh/blender/source/blender/render/intern/source/volumetric.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-36583
+ /trunk/blender:31524-36603
Modified: branches/bmesh/blender/build_files/cmake/packaging.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/packaging.cmake 2011-05-10 23:54:15 UTC (rev 36605)
+++ branches/bmesh/blender/build_files/cmake/packaging.cmake 2011-05-11 00:19:13 UTC (rev 36606)
@@ -38,7 +38,7 @@
include(build_files/cmake/RpmBuild.cmake)
if(RPMBUILD_FOUND AND NOT WIN32)
set(CPACK_GENERATOR "RPM")
- set(CPACK_RPM_PACKAGE_RELEASE "r${BUILD_REV}")
+ set(CPACK_RPM_PACKAGE_RELEASE "1.r${BUILD_REV}")
set(CPACK_SET_DESTDIR "true")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
set(CPACK_PACKAGE_RELOCATABLE "false")
Modified: branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in
===================================================================
--- branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in 2011-05-10 23:54:15 UTC (rev 36605)
+++ branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in 2011-05-11 00:19:13 UTC (rev 36606)
@@ -5,7 +5,7 @@
Summary: @CPACK_RPM_PACKAGE_SUMMARY@
Name: @CPACK_RPM_PACKAGE_NAME@
Version: @CPACK_RPM_PACKAGE_VERSION@
-Release: @CPACK_RPM_PACKAGE_RELEASE@
+Release: @CPACK_RPM_PACKAGE_RELEASE@%{?dist}
License: @CPACK_RPM_PACKAGE_LICENSE@
Group: @CPACK_RPM_PACKAGE_GROUP@
Vendor: @CPACK_RPM_PACKAGE_VENDOR@
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-10 23:54:15 UTC (rev 36605)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h 2011-05-11 00:19:13 UTC (rev 36606)
@@ -52,6 +52,9 @@
#ifndef RID_INPUT
#define RID_INPUT 0x10000003
#endif
+#ifndef RIM_INPUTSINK
+#define RIM_INPUTSINK 0x1
+#endif
#ifndef RI_KEY_BREAK
#define RI_KEY_BREAK 0x1
#endif
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-36603
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-05-10 23:54:15 UTC (rev 36605)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py 2011-05-11 00:19:13 UTC (rev 36606)
@@ -127,6 +127,7 @@
col.prop(cam, "show_mist", text="Mist")
col.prop(cam, "show_title_safe", text="Title Safe")
col.prop(cam, "show_name", text="Name")
+ col.prop_menu_enum(cam, "show_guide")
col = split.column()
col.prop(cam, "draw_size", text="Size")
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_metaball.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_game.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_material.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_particle.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_field.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_texture.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36583
+ /trunk/blender/release/scripts/startup/bl_ui/properties_world.py:36154-36603
Property changes on: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Modified: svn:mergeinfo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list