[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43919] branches/bmesh/blender: svn merge ^/trunk/blender -r43887:43918
Campbell Barton
ideasman42 at gmail.com
Sun Feb 5 23:13:15 CET 2012
Revision: 43919
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43919
Author: campbellbarton
Date: 2012-02-05 22:13:10 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43887:43918
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43887
Modified Paths:
--------------
branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
branches/bmesh/blender/release/text/readme.html
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/collada/AnimationExporter.cpp
branches/bmesh/blender/source/blender/collada/AnimationExporter.h
branches/bmesh/blender/source/blender/collada/ArmatureExporter.cpp
branches/bmesh/blender/source/blender/collada/DocumentExporter.cpp
branches/bmesh/blender/source/blender/collada/ExportSettings.h
branches/bmesh/blender/source/blender/collada/TransformWriter.cpp
branches/bmesh/blender/source/blender/collada/collada.cpp
branches/bmesh/blender/source/blender/collada/collada.h
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
branches/bmesh/blender/source/blender/editors/metaball/mball_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
branches/bmesh/blender/source/blender/editors/space_clip/space_clip.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/quicktime/apple/quicktime_import.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /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
/trunk/blender:39992-43887
+ /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
/trunk/blender:39992-43918
Modified: branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
===================================================================
--- branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2012-02-05 21:58:24 UTC (rev 43918)
+++ branches/bmesh/blender/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp 2012-02-05 22:13:10 UTC (rev 43919)
@@ -2780,21 +2780,23 @@
{
const RContact& c = psb->m_rcontacts[i];
const sCti& cti = c.m_cti;
- btRigidBody* tmpRigid = btRigidBody::upcast(cti.m_colObj);
- const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0);
- const btVector3 vb = c.m_node->m_x-c.m_node->m_q;
- const btVector3 vr = vb-va;
- const btScalar dn = btDot(vr, cti.m_normal);
- if(dn<=SIMD_EPSILON)
- {
- const btScalar dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg );
- const btVector3 fv = vr - (cti.m_normal * dn);
- // c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient
- const btVector3 impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst );
- c.m_node->m_x -= impulse * c.m_c2;
- if (tmpRigid)
- tmpRigid->applyImpulse(impulse,c.m_c1);
+ if (cti.m_colObj->hasContactResponse()) {
+ btRigidBody* tmpRigid = btRigidBody::upcast(cti.m_colObj);
+ const btVector3 va = tmpRigid ? tmpRigid->getVelocityInLocalPoint(c.m_c1)*dt : btVector3(0,0,0);
+ const btVector3 vb = c.m_node->m_x-c.m_node->m_q;
+ const btVector3 vr = vb-va;
+ const btScalar dn = btDot(vr, cti.m_normal);
+ if(dn<=SIMD_EPSILON)
+ {
+ const btScalar dp = btMin( (btDot(c.m_node->m_x, cti.m_normal) + cti.m_offset), mrg );
+ const btVector3 fv = vr - (cti.m_normal * dn);
+ // c0 is the impulse matrix, c3 is 1 - the friction coefficient or 0, c4 is the contact hardness coefficient
+ const btVector3 impulse = c.m_c0 * ( (vr - (fv * c.m_c3) + (cti.m_normal * (dp * c.m_c4))) * kst );
+ c.m_node->m_x -= impulse * c.m_c2;
+ if (tmpRigid)
+ tmpRigid->applyImpulse(impulse,c.m_c1);
+ }
}
}
}
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-02-05 21:58:24 UTC (rev 43918)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2012-02-05 22:13:10 UTC (rev 43919)
@@ -717,10 +717,11 @@
if (key != GHOST_kKeyUnknown) {
char utf8_char[6] = {0} ;
+ char ascii = 0;
wchar_t utf16[2]={0};
- BYTE state[256];
- GetKeyboardState((PBYTE)state);
+ BYTE state[256] ={0};
+ GetKeyboardState(state);
if(ToUnicodeEx(vk, 0, state, utf16, 2, 0, system->m_keylayout))
WideCharToMultiByte(CP_UTF8, 0,
@@ -728,9 +729,14 @@
(LPSTR) utf8_char, 5,
NULL,NULL); else *utf8_char = 0;
- if(!keyDown) utf8_char[0] = '\0';
- event = new GHOST_EventKey(system->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, (*utf8_char & 0x80)?'?':*utf8_char, utf8_char);
+
+ if(!keyDown) {utf8_char[0] = '\0'; ascii='\0';}
+ else ascii = utf8_char[0]& 0x80?'?':utf8_char[0];
+
+ if(0x80&state[VK_MENU]) utf8_char[0]='\0';
+
+ event = new GHOST_EventKey(system->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, ascii, utf8_char);
#ifdef GHOST_DEBUG
std::cout << ascii << std::endl;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43887
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43918
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-05 21:58:24 UTC (rev 43918)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py 2012-02-05 22:13:10 UTC (rev 43919)
@@ -547,23 +547,15 @@
col = layout.column(align=True)
- col.prop(sc, "show_marker_pattern", text="Pattern")
- col.prop(sc, "show_marker_search", text="Search")
- col.prop(sc, "show_pyramid_levels", text="Pyramid")
-
- col.prop(sc, "show_track_path", text="Path")
- row = col.row()
- row.active = sc.show_track_path
- row.prop(sc, "path_length", text="Length")
-
col.prop(sc, "show_disabled", "Disabled Tracks")
+ col.prop(sc, "show_names", text="Names and Status")
col.prop(sc, "show_bundles", text="3D Markers")
- col.prop(sc, "show_names", text="Names and Status")
- col.prop(sc, "show_tiny_markers", text="Compact Markers")
+ col.prop(sc, "use_mute_footage", text="Mute Footage")
+ col.prop(sc, "lock_selection")
- col.prop(sc, "show_grease_pencil", text="Grease Pencil")
- col.prop(sc, "use_mute_footage", text="Mute")
+ if sc.view == 'GRAPH':
+ col.prop(sc, "lock_time_cursor")
if sc.mode == 'DISTORTION':
col.prop(sc, "show_grid", text="Grid")
@@ -571,17 +563,36 @@
elif sc.mode == 'RECONSTRUCTION':
col.prop(sc, "show_stable", text="Stable")
- col.prop(sc, "lock_selection")
-
- if sc.view == 'GRAPH':
- col.prop(sc, "lock_time_cursor")
-
clip = sc.clip
if clip:
col.label(text="Display Aspect Ratio:")
- col.prop(clip, "display_aspect", text="")
+ row = col.row()
+ row.prop(clip, "display_aspect", text="")
+class CLIP_PT_marker_display(Panel):
+ bl_space_type = 'CLIP_EDITOR'
+ bl_region_type = 'UI'
+ bl_label = "Marker Display"
+
+ def draw(self, context):
+ layout = self.layout
+ sc = context.space_data
+
+ col = layout.column(align=True)
+
+ row = col.row()
+ row.prop(sc, "show_marker_pattern", text="Pattern")
+ row.prop(sc, "show_marker_search", text="Search")
+
+ col.prop(sc, "show_tiny_markers", text="Thin Markers")
+ col.prop(sc, "show_track_path", text="Path")
+
+ row = col.row()
+ row.active = sc.show_track_path
+ row.prop(sc, "path_length", text="Length")
+
+
class CLIP_PT_track_settings(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2012-02-05 21:58:24 UTC (rev 43918)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py 2012-02-05 22:13:10 UTC (rev 43919)
@@ -364,7 +364,7 @@
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:2.6/Manual'
- layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-261/'
+ layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-262/'
layout.separator()
Modified: branches/bmesh/blender/release/text/readme.html
===================================================================
--- branches/bmesh/blender/release/text/readme.html 2012-02-05 21:58:24 UTC (rev 43918)
+++ branches/bmesh/blender/release/text/readme.html 2012-02-05 22:13:10 UTC (rev 43919)
@@ -12,18 +12,18 @@
</style>
</head>
<body>
-<p class="title"><b>Blender 2.61</b></p>
+<p class="title"><b>Blender 2.62</b></p>
<p><br></p>
<p class="header"><b>About</b></p>
<p class="body">Welcome to Blender, the free, open source 3D application for modeling, animation, rendering, compositing, video editing and game creation. Blender is available for Linux, Mac OS X, Windows, Solaris and FreeBSD and has a large world-wide community.</p>
<p class="body">Blender can be used freely for any purpose, including commercial use and distribution. It's free and open-source software, released under the GNU GPL licence. The entire source code is available on our website.</p>
<p class="body">For more information, visit <a href="http://www.blender.org">blender.org</a>.</p>
<p><br></p>
-<p class="header"><b>2.61</b></p>
-<p class="body">The Blender Foundation and online developer community is proud to present Blender 2.61. This release is the second official stable release of the Blender 2.6 series, in which we will refine the 2.5 series and add exciting new features again.<a href="http://www.blender.org/development/release-logs/blender-261/">More information about this release</a>.</p>
+<p class="header"><b>2.62</b></p>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list