Revision: 24034
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24034
Author: campbellbarton
Date: 2009-10-21 09:57:15 +0200 (Wed, 21 Oct 2009)
Log Message:
-----------
missed these in last commit
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/release/scripts/modules/bpy_ops.py
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2009-10-21
07:56:08 UTC (rev 24033)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2009-10-21
07:57:15 UTC (rev 24034)
@@ -1412,7 +1412,7 @@
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 @@
/* 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);
Modified: trunk/blender/release/scripts/modules/bpy_ops.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_ops.py 2009-10-21 07:56:08 UTC
(rev 24033)
+++ trunk/blender/release/scripts/modules/bpy_ops.py 2009-10-21 07:57:15 UTC
(rev 24034)
@@ -155,50 +155,44 @@
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.'''
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
