[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46633] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46629:46632
Campbell Barton
ideasman42 at gmail.com
Mon May 14 16:55:11 CEST 2012
Revision: 46633
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46633
Author: campbellbarton
Date: 2012-05-14 14:55:10 +0000 (Mon, 14 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46629:46632
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46629
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46629
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-46632
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2012-05-14 14:39:21 UTC (rev 46632)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/object.py 2012-05-14 14:55:10 UTC (rev 46633)
@@ -104,24 +104,29 @@
class SelectCamera(Operator):
- '''Select object matching a naming pattern'''
+ '''Select the active camera'''
bl_idname = "object.select_camera"
bl_label = "Select Camera"
bl_options = {'REGISTER', 'UNDO'}
- @classmethod
- def poll(cls, context):
- return context.scene.camera is not None
-
def execute(self, context):
scene = context.scene
- camera = scene.camera
- if camera.name not in scene.objects:
+ view = context.space_data
+ if view.type == 'VIEW_3D' and not view.lock_camera_and_layers:
+ camera = view.camera
+ else:
+ camera = scene.camera
+
+ if camera is None:
+ self.report({'WARNING'}, "No camera found")
+ elif camera.name not in scene.objects:
self.report({'WARNING'}, "Active camera is not in this scene")
+ else:
+ context.scene.objects.active = camera
+ camera.select = True
+ return {'FINISHED'}
- context.scene.objects.active = camera
- camera.select = True
- return {'FINISHED'}
+ return {'CANCELLED'}
class SelectHierarchy(Operator):
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-46629
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-46632
Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-05-14 14:39:21 UTC (rev 46632)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c 2012-05-14 14:55:10 UTC (rev 46633)
@@ -610,13 +610,13 @@
WM_keymap_add_item(keymap, "CLIP_OT_select_circle", CKEY, KM_PRESS, 0, 0);
WM_keymap_add_menu(keymap, "CLIP_MT_select_grouped", GKEY, KM_PRESS, KM_SHIFT, 0);
- kmi = WM_keymap_add_item(keymap, "CLIP_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0);
+ kmi = WM_keymap_add_item(keymap, "CLIP_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_ALT, 0);
RNA_boolean_set(kmi->ptr, "deselect", FALSE);
- kmi = WM_keymap_add_item(keymap, "CLIP_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_SHIFT, 0);
+ kmi = WM_keymap_add_item(keymap, "CLIP_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL | KM_SHIFT | KM_ALT, 0);
RNA_boolean_set(kmi->ptr, "deselect", TRUE);
/* marker */
- WM_keymap_add_item(keymap, "CLIP_OT_add_marker_slide", LEFTMOUSE, KM_CLICK, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "CLIP_OT_add_marker_slide", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "CLIP_OT_delete_marker", DELKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "CLIP_OT_delete_marker", XKEY, KM_PRESS, KM_SHIFT, 0);
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-46629
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-46632
More information about the Bf-blender-cvs
mailing list