1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- improvements from Mathias Panzenböck (panzi) patch [#19695], which avoid conversion to/from strings with context property assignment. though didnt apply entire patch.

Browse Source 
- [#19698] Add Menu Item: View3d -> Object -> Move to layer
  from Howard Brooks (hbroo)
- had cursor grab commented by mistake for X11
This commit is contained in:
Campbell Barton 2009-10-21 07:56:08 +00:00
parent ddb1f64fff
commit f4d6bbd656
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@ -1412,7 +1412,7 @@ setWindowCursorGrab(
setWindowCursorVisibility(false);
}
//XGrabPointer(m_display, m_window, True, ButtonPressMask| ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
XGrabPointer(m_display, m_window, True, ButtonPressMask| ButtonReleaseMask|PointerMotionMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
}
else {
if (m_cursorGrab==GHOST_kGrabHide) {
@ -1430,7 +1430,7 @@ setWindowCursorGrab(
/* Almost works without but important otherwise the mouse GHOST location can be incorrect on exit */
setCursorGrabAccum(0, 0);
m_cursorGrabBounds.m_l= m_cursorGrabBounds.m_r= -1; /* disable */
//XUngrabPointer(m_display, CurrentTime);
XUngrabPointer(m_display, CurrentTime);
}
XFlush(m_display);

24
release/scripts/modules/bpy_ops.py
View File

@ -155,50 +155,44 @@ class MESH_OT_delete_edgeloop(bpy.types.Operator):
rna_path_prop = bpy.props.StringProperty(attr="path", name="Context Attributes", description="rna context string", maxlen= 1024, default= "")
def execute_context_assign(self, context):
exec("context.%s=self.value" % self.path)
return ('FINISHED',)
class WM_OT_context_set_boolean(bpy.types.Operator):
'''Set a context value.'''
__idname__ = "wm.context_set_boolean"
__label__ = "Context Set"
__props__ = [rna_path_prop, bpy.props.BoolProperty(attr="value", name="Value", description="Assignment value", default= True)]
def execute(self, context):
exec("context.%s=%s" % (self.path, self.value)) # security nuts will complain.
return ('FINISHED',)
execute = execute_context_assign
class WM_OT_context_set_int(bpy.types.Operator): # same as enum
'''Set a context value.'''
__idname__ = "wm.context_set_int"
__label__ = "Context Set"
__props__ = [rna_path_prop, bpy.props.IntProperty(attr="value", name="Value", description="Assignment value", default= 0)]
def execute(self, context):
exec("context.%s=%d" % (self.path, self.value)) # security nuts will complain.
return ('FINISHED',)
execute = execute_context_assign
class WM_OT_context_set_float(bpy.types.Operator): # same as enum
'''Set a context value.'''
__idname__ = "wm.context_set_int"
__label__ = "Context Set"
__props__ = [rna_path_prop, bpy.props.FloatProperty(attr="value", name="Value", description="Assignment value", default= 0.0)]
def execute(self, context):
exec("context.%s=%f" % (self.path, self.value)) # security nuts will complain.
return ('FINISHED',)
execute = execute_context_assign
class WM_OT_context_set_string(bpy.types.Operator): # same as enum
'''Set a context value.'''
__idname__ = "wm.context_set_string"
__label__ = "Context Set"
__props__ = [rna_path_prop, bpy.props.StringProperty(attr="value", name="Value", description="Assignment value", maxlen= 1024, default= "")]
def execute(self, context):
exec("context.%s='%s'" % (self.path, self.value)) # security nuts will complain.
return ('FINISHED',)
execute = execute_context_assign
class WM_OT_context_set_enum(bpy.types.Operator):
'''Set a context value.'''
__idname__ = "wm.context_set_enum"
__label__ = "Context Set"
__props__ = [rna_path_prop, bpy.props.StringProperty(attr="value", name="Value", description="Assignment value (as a string)", maxlen= 1024, default= "")]
def execute(self, context):
exec("context.%s='%s'" % (self.path, self.value)) # security nuts will complain.
return ('FINISHED',)
execute = execute_context_assign
class WM_OT_context_toggle(bpy.types.Operator):
'''Toggle a context value.'''

1
release/scripts/ui/space_view3d.py
View File

@ -427,6 +427,7 @@ class VIEW3D_MT_object(bpy.types.Menu):
layout.itemS()
layout.itemO("object.move_to_layer", text="Move to Layer...")
layout.itemM("VIEW3D_MT_object_showhide")
layout.item_menu_enumO("object.convert", "target")