Revision: 35985
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35985
Author: campbellbarton
Date: 2011-04-04 03:25:05 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
disable continuous grab in the header, its more annoying then useful.
also NULL texture's point density tree data when copying to prevent possible
double free.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c 2011-04-03
23:35:20 UTC (rev 35984)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c 2011-04-04
03:25:05 UTC (rev 35985)
@@ -798,6 +798,7 @@
if(texn->pd) {
texn->pd= MEM_dupallocN(texn->pd);
if(texn->pd->coba) {
+ texn->pd->point_tree = NULL;
texn->pd->coba= MEM_dupallocN(texn->pd->coba);
}
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-03 23:35:20 UTC (rev 35984)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
2011-04-04 03:25:05 UTC (rev 35985)
@@ -726,7 +726,15 @@
wrap = (U.uiflag &
USER_CONTINUOUS_MOUSE) && ((op->flag & OP_GRAB_POINTER) || (ot->flag &
OPTYPE_GRAB_POINTER));
}
+ /* exception, cont. grab in header is annoying
*/
if(wrap) {
+ ARegion *ar= CTX_wm_region(C);
+ if(ar && ar->regiontype ==
RGN_TYPE_HEADER) {
+ wrap= FALSE;
+ }
+ }
+
+ if(wrap) {
rcti *winrect= NULL;
ARegion *ar= CTX_wm_region(C);
ScrArea *sa= CTX_wm_area(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
