[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46404] branches/meshdata_transfer: svn merge ^/trunk/blender -r46340:46350
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue May 8 01:36:23 CEST 2012
Revision: 46404
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46404
Author: cyborgmuppet
Date: 2012-05-07 23:36:22 +0000 (Mon, 07 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46340:46350
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46340
Modified Paths:
--------------
branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
branches/meshdata_transfer/source/blender/blenkernel/intern/blender.c
branches/meshdata_transfer/source/blender/blenkernel/intern/brush.c
branches/meshdata_transfer/source/blender/blenkernel/intern/bvhutils.c
branches/meshdata_transfer/source/blender/blenkernel/intern/camera.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/colortools.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/context.c
branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fcurve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fmodifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/font.c
branches/meshdata_transfer/source/blender/blenkernel/intern/gpencil.c
branches/meshdata_transfer/source/blender/blenkernel/intern/group.c
branches/meshdata_transfer/source/blender/blenkernel/intern/idprop.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image_gen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ipo.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lamp.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
branches/meshdata_transfer/source/blender/blenkernel/intern/library.c
branches/meshdata_transfer/source/blender/blenkernel/intern/material.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/modifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/packedFile.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/property.c
branches/meshdata_transfer/source/blender/blenkernel/intern/scene.c
branches/meshdata_transfer/source/blender/blenkernel/intern/screen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sound.c
branches/meshdata_transfer/source/blender/blenkernel/intern/speaker.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/texture.c
branches/meshdata_transfer/source/blender/blenkernel/intern/world.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature_sketch.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_intern.h
branches/meshdata_transfer/source/blender/editors/mesh/mesh_ops.c
branches/meshdata_transfer/source/blender/editors/physics/physics_pointcache.c
branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/meshdata_transfer/source/blender/editors/screen/screendump.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/meshdata_transfer/source/blender/makesdna/DNA_object_types.h
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46350
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46360
Modified: branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h 2012-05-07 23:36:22 UTC (rev 46404)
@@ -173,25 +173,25 @@
PASS_NONE = 0,
PASS_COMBINED = 1,
PASS_DEPTH = 2,
- PASS_NORMAL = 8,
- PASS_UV = 16,
- PASS_OBJECT_ID = 32,
- PASS_MATERIAL_ID = 64,
- PASS_DIFFUSE_COLOR = 128,
- PASS_GLOSSY_COLOR = 256,
- PASS_TRANSMISSION_COLOR = 512,
- PASS_DIFFUSE_INDIRECT = 1024,
- PASS_GLOSSY_INDIRECT = 2048,
- PASS_TRANSMISSION_INDIRECT = 4096,
- PASS_DIFFUSE_DIRECT = 8192,
- PASS_GLOSSY_DIRECT = 16384,
- PASS_TRANSMISSION_DIRECT = 32768,
- PASS_EMISSION = 65536,
- PASS_BACKGROUND = 131072,
- PASS_AO = 262144,
- PASS_SHADOW = 524288,
- PASS_MOTION = 1048576,
- PASS_MOTION_WEIGHT = 2097152
+ PASS_NORMAL = 4,
+ PASS_UV = 8,
+ PASS_OBJECT_ID = 16,
+ PASS_MATERIAL_ID = 32,
+ PASS_DIFFUSE_COLOR = 64,
+ PASS_GLOSSY_COLOR = 128,
+ PASS_TRANSMISSION_COLOR = 256,
+ PASS_DIFFUSE_INDIRECT = 512,
+ PASS_GLOSSY_INDIRECT = 1024,
+ PASS_TRANSMISSION_INDIRECT = 2048,
+ PASS_DIFFUSE_DIRECT = 4096,
+ PASS_GLOSSY_DIRECT = 8192,
+ PASS_TRANSMISSION_DIRECT = 16384,
+ PASS_EMISSION = 32768,
+ PASS_BACKGROUND = 65536,
+ PASS_AO = 131072,
+ PASS_SHADOW = 262144,
+ PASS_MOTION = 524288,
+ PASS_MOTION_WEIGHT = 1048576
} PassType;
#define PASS_ALL (~0)
Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm 2012-05-07 23:36:22 UTC (rev 46404)
@@ -1280,7 +1280,7 @@
GHOST_Window* window = (GHOST_Window*)m_windowManager->getActiveWindow();
//Discard quit event if we are in cursor grab sequence
- if (window && (window->getCursorGrabMode() != GHOST_kGrabDisable) && (window->getCursorGrabMode() != GHOST_kGrabNormal))
+ if (window && window->getCursorGrabModeIsWarp())
return GHOST_kExitCancel;
//Check open windows if some changes are not saved
@@ -1329,7 +1329,7 @@
}
//Discard event if we are in cursor grab sequence, it'll lead to "stuck cursor" situation if the alert panel is raised
- if (window && (window->getCursorGrabMode() != GHOST_kGrabDisable) && (window->getCursorGrabMode() != GHOST_kGrabNormal))
+ if (window && window->getCursorGrabModeIsWarp())
return GHOST_kExitCancel;
//Check open windows if some changes are not saved
@@ -1488,7 +1488,16 @@
}
case NSMouseMoved:
- switch (window->getCursorGrabMode()) {
+ GHOST_TGrabCursorMode grab_mode = window->getCursorGrabMode();
+
+ /* TODO: CHECK IF THIS IS A TABLET EVENT */
+ bool is_tablet = false;
+
+ if (is_tablet && window->getCursorGrabModeIsWarp()) {
+ grab_mode = GHOST_kGrabDisable;
+ }
+
+ switch (grab_mode) {
case GHOST_kGrabHide: //Cursor hidden grab operation : no cursor move
{
GHOST_TInt32 x_warp, y_warp, x_accum, y_accum, x, y;
Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-05-07 23:36:22 UTC (rev 46404)
@@ -649,8 +649,10 @@
system->getCursorPosition(x_screen, y_screen);
- if(window->getCursorGrabMode() != GHOST_kGrabDisable && window->getCursorGrabMode() != GHOST_kGrabNormal)
- {
+ /* TODO: CHECK IF THIS IS A TABLET EVENT */
+ bool is_tablet = false;
+
+ if (is_tablet == false && window->getCursorGrabModeIsWarp()) {
GHOST_TInt32 x_new= x_screen;
GHOST_TInt32 y_new= y_screen;
GHOST_TInt32 x_accum, y_accum;
Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp 2012-05-07 23:36:22 UTC (rev 46404)
@@ -471,9 +471,14 @@
case MotionNotify:
{
XMotionEvent &xme = xe->xmotion;
-
- if(window->getCursorGrabMode() != GHOST_kGrabDisable && window->getCursorGrabMode() != GHOST_kGrabNormal)
- {
+
+#ifdef WITH_X11_XINPUT
+ bool is_tablet = window->GetXTablet().CommonData.Active != GHOST_kTabletModeNone;
+#else
+ bool is_tablet = false;
+#endif
+
+ if (is_tablet == false && window->getCursorGrabModeIsWarp()) {
GHOST_TInt32 x_new= xme.x_root;
GHOST_TInt32 y_new= xme.y_root;
GHOST_TInt32 x_accum, y_accum;
Modified: branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h
===================================================================
--- branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h 2012-05-07 23:36:22 UTC (rev 46404)
@@ -161,6 +161,7 @@
*/
inline virtual bool getCursorVisibility() const;
inline virtual GHOST_TGrabCursorMode getCursorGrabMode() const;
+ inline virtual bool getCursorGrabModeIsWarp() const;
inline virtual void getCursorGrabInitPos(GHOST_TInt32 &x, GHOST_TInt32 &y) const;
inline virtual void getCursorGrabAccum(GHOST_TInt32 &x, GHOST_TInt32 &y) const;
inline virtual void setCursorGrabAccum(GHOST_TInt32 x, GHOST_TInt32 y);
@@ -362,6 +363,12 @@
return m_cursorGrab;
}
+inline bool GHOST_Window::getCursorGrabModeIsWarp() const
+{
+ return (m_cursorGrab == GHOST_kGrabWrap) ||
+ (m_cursorGrab == GHOST_kGrabHide);
+}
+
inline void GHOST_Window::getCursorGrabInitPos(GHOST_TInt32 &x, GHOST_TInt32 &y) const
{
x = m_cursorGrabInitPos[0];
Modified: branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py 2012-05-07 23:36:22 UTC (rev 46404)
@@ -1675,6 +1675,7 @@
layout.operator("mesh.blend_from_shape")
layout.operator("mesh.shape_propagate_to_all")
layout.operator("mesh.select_vertex_path")
+ layout.operator("mesh.sort_elements")
class VIEW3D_MT_edit_mesh_select_mode(Menu):
@@ -1750,8 +1751,7 @@
layout.operator("mesh.vertices_smooth")
layout.operator("mesh.remove_doubles")
- layout.operator("mesh.vertices_sort")
- layout.operator("mesh.vertices_randomize")
+ layout.operator("mesh.sort_elements", text="Sort Vertices").elements = {"VERT"}
layout.operator("mesh.select_vertex_path")
@@ -1796,6 +1796,7 @@
layout.operator("mesh.bevel")
layout.operator("mesh.edge_split")
layout.operator("mesh.bridge_edge_loops")
+ layout.operator("mesh.sort_elements", text="Sort Edges").elements = {"EDGE"}
layout.separator()
@@ -1828,7 +1829,7 @@
layout.operator("mesh.bevel")
layout.operator("mesh.solidify")
layout.operator("mesh.wireframe")
- layout.operator("mesh.sort_faces")
+ layout.operator("mesh.sort_elements", text="Sort Faces").elements = {"FACE"}
layout.separator()
Modified: branches/meshdata_transfer/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/intern/action.c 2012-05-07 23:27:27 UTC (rev 46403)
+++ branches/meshdata_transfer/source/blender/blenkernel/intern/action.c 2012-05-07 23:36:22 UTC (rev 46404)
@@ -83,7 +83,7 @@
{
bAction *act;
- act= BKE_libblock_alloc(&G.main->action, ID_AC, name);
+ act = BKE_libblock_alloc(&G.main->action, ID_AC, name);
return act;
}
@@ -105,8 +105,8 @@
tMakeLocalActionContext *mlac = (tMakeLocalActionContext *)mlac_ptr;
if (adt->action == mlac->act) {
- if (id->lib) mlac->is_lib= TRUE;
- else mlac->is_local= TRUE;
+ if (id->lib) mlac->is_lib = TRUE;
+ else mlac->is_local = TRUE;
}
}
@@ -129,25 +129,25 @@
void BKE_action_make_local(bAction *act)
{
tMakeLocalActionContext mlac = {act, NULL, FALSE, FALSE};
- Main *bmain= G.main;
+ Main *bmain = G.main;
- if (act->id.lib==NULL)
+ if (act->id.lib == NULL)
return;
// XXX: double-check this; it used to be just single-user check, but that was when fake-users were still default
- if ((act->id.flag & LIB_FAKEUSER) && (act->id.us<=1)) {
+ if ((act->id.flag & LIB_FAKEUSER) && (act->id.us <= 1)) {
id_clear_lib_data(bmain, &act->id);
return;
}
BKE_animdata_main_cb(bmain, make_localact_init_cb, &mlac);
- if (mlac.is_local && mlac.is_lib==FALSE) {
+ if (mlac.is_local && mlac.is_lib == FALSE) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list