Revision: 56842
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56842
Author: campbellbarton
Date: 2013-05-16 09:34:59 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56537 -c56538 -c56539 -c56572 -c56577 -c56581
-c56601 -c56605 -c56606
Modified Paths:
--------------
tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/editderivedmesh.c
tags/blender-2.67a-release/blender/source/blender/bmesh/operators/bmo_connect.c
tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.cpp
tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.h
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_templates.c
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_widgets.c
tags/blender-2.67a-release/blender/source/blender/render/intern/source/convertblender.c
tags/blender-2.67a-release/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Property Changed:
----------------
tags/blender-2.67a-release/blender/
Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
+
/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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56537-56539,56572,56577,56581,56601,56605-56606
Modified:
tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
2013-05-16 09:05:06 UTC (rev 56841)
+++ tags/blender-2.67a-release/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
2013-05-16 09:34:59 UTC (rev 56842)
@@ -44,6 +44,13 @@
#include "GHOST_SystemCocoa.h"
#include "GHOST_Debug.h"
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+/* Lion style fullscreen support when building with the 10.6 SDK */
+enum {
+ NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
+ NSFullScreenWindowMask = 1 << 14
+};
+#endif
#pragma mark Cocoa window delegate object
/* live resize ugly patch
Modified:
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-05-16 09:05:06 UTC (rev 56841)
+++
tags/blender-2.67a-release/blender/source/blender/blenkernel/intern/editderivedmesh.c
2013-05-16 09:34:59 UTC (rev 56842)
@@ -1766,6 +1766,9 @@
float cos_mid[3];
float ray_no[3];
+ if (e->l == NULL)
+ continue;
+
if (vertexCos) {
copy_v3_v3(cos[0], vertexCos[BM_elem_index_get(e->v1)]);
copy_v3_v3(cos[1], vertexCos[BM_elem_index_get(e->v2)]);
Modified:
tags/blender-2.67a-release/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/bmesh/operators/bmo_connect.c
2013-05-16 09:05:06 UTC (rev 56841)
+++
tags/blender-2.67a-release/blender/source/blender/bmesh/operators/bmo_connect.c
2013-05-16 09:34:59 UTC (rev 56842)
@@ -419,63 +419,69 @@
}
}
- /* Vert rough attempt to determine proper winding for the
bridge quads:
- * just uses the first loop it finds for any of the edges of
ee2 or ee1 */
- if (wdir == 0) {
- for (i = 0; i < BLI_array_count(ee2); i++) {
- if (ee2[i]->l) {
- wdir = (ee2[i]->l->v == vv2[i]) ? (-1)
: (1);
- break;
+ if (use_merge == false) {
+ /* Vert rough attempt to determine proper winding for
the bridge quads:
+ * just uses the first loop it finds for any of the
edges of ee2 or ee1 */
+ if (wdir == 0) {
+ for (i = 0; i < BLI_array_count(ee2); i++) {
+ if (ee2[i]->l) {
+ wdir = (ee2[i]->l->v == vv2[i])
? (-1) : (1);
+ break;
+ }
}
}
- }
- if (wdir == 0) {
- for (i = 0; i < BLI_array_count(ee1); i++) {
- j = clamp_index((i * dir1) + starti,
BLI_array_count(ee1));
- if (ee1[j]->l && ee2[j]->l) {
- wdir = (ee2[j]->l->v == vv2[j]) ? (1) :
(-1);
- break;
+ if (wdir == 0) {
+ for (i = 0; i < BLI_array_count(ee1); i++) {
+ j = clamp_index((i * dir1) + starti,
BLI_array_count(ee1));
+ if (ee1[j]->l && ee2[j]->l) {
+ wdir = (ee2[j]->l->v == vv2[j])
? (1) : (-1);
+ break;
+ }
}
}
}
-
+
+#define EDGE_ORD_VERTS_NEXT { \
+ i1 = clamp_index(i * dir1 + starti, lenv1); \
+ i1next = clamp_index((i + 1) * dir1 + starti, lenv1); \
+ i2 = i; \
+ i2next = clamp_index(i + 1, lenv2); \
+ if (vv1[i1] == vv1[i1next]) continue; \
+ } (void)0
+
+#define EDGE_ORD_VERTS { \
+ i1 = clamp_index(i * dir1 + starti, lenv1); \
+ i2 = i; \
+ } (void)0
+
/* merge loops of bridge faces */
if (use_merge) {
const int vert_len = min_ii(BLI_array_count(vv1),
BLI_array_count(vv2)) - ((cl1 || cl2) ? 1 : 0);
const int edge_len = min_ii(BLI_array_count(ee1),
BLI_array_count(ee2));
- if (merge_factor <= 0.0f) {
- /* 2 --> 1 */
- for (i = 0; i < vert_len; i++) {
- BM_vert_splice(bm, vv2[i], vv1[i]);
- }
- for (i = 0; i < edge_len; i++) {
- BM_edge_splice(bm, ee2[i], ee1[i]);
- }
+ /* first get the edges in order (before splicing verts)
*/
+ for (i = 0; i < vert_len; i++) {
+ int i1, i1next, i2, i2next;
+ EDGE_ORD_VERTS_NEXT;
+
+ ee1[i] = BM_edge_exists(vv1[i1], vv1[i1next]);
+ ee2[i] = BM_edge_exists(vv2[i2], vv2[i2next]);
}
- else if (merge_factor >= 1.0f) {
- /* 1 --> 2 */
- for (i = 0; i < vert_len; i++) {
- BM_vert_splice(bm, vv1[i], vv2[i]);
- }
- for (i = 0; i < edge_len; i++) {
- BM_edge_splice(bm, ee1[i], ee2[i]);
- }
+ for (i = 0; i < vert_len; i++) {
+ int i1, i2;
+ EDGE_ORD_VERTS;
+
+ BM_data_interp_from_verts(bm, vv1[i1], vv2[i2],
vv2[i2], merge_factor);
+ interp_v3_v3v3(vv2[i2]->co, vv1[i1]->co,
vv2[i2]->co, merge_factor);
+ BM_elem_flag_merge(vv1[i1], vv2[i2]);
+ BM_vert_splice(bm, vv1[i1], vv2[i2]);
}
- else {
- /* mid factor, be tricky */
- /* 1 --> 2 */
- for (i = 0; i < vert_len; i++) {
- BM_data_interp_from_verts(bm, vv1[i],
vv2[i], vv2[i], merge_factor);
- interp_v3_v3v3(vv2[i]->co, vv1[i]->co,
vv2[i]->co, merge_factor);
- BM_elem_flag_merge(vv1[i], vv2[i]);
- BM_vert_splice(bm, vv1[i], vv2[i]);
- }
- for (i = 0; i < edge_len; i++) {
- BM_data_interp_from_edges(bm, ee1[i],
ee2[i], ee2[i], merge_factor);
- BM_elem_flag_merge(ee1[i], ee2[i]);
- BM_edge_splice(bm, ee1[i], ee2[i]);
- }
+ for (i = 0; i < edge_len; i++) {
+ BMEdge *e1 = ee1[i];
+ BMEdge *e2 = ee2[i];
+ BM_data_interp_from_edges(bm, e1, e2, e2,
merge_factor);
+ BM_elem_flag_merge(e1, e2);
+ BM_edge_splice(bm, e1, e2);
}
}
else {
@@ -492,15 +498,8 @@
int i1, i1next, i2, i2next;
- i1 = clamp_index(i * dir1 + starti, lenv1);
- i1next = clamp_index((i + 1) * dir1 + starti,
lenv1);
- i2 = i;
- i2next = clamp_index(i + 1, lenv2);
+ EDGE_ORD_VERTS_NEXT;
- if (vv1[i1] == vv1[i1next]) {
- continue;
- }
-
if (wdir < 0) {
SWAP(int, i1, i1next);
SWAP(int, i2, i2next);
@@ -539,6 +538,9 @@
}
}
+#undef EDGE_ORD_VERTS_NEXT
+#undef EDGE_ORD_VERTS
+
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "faces.out",
BM_FACE, FACE_OUT);
cleanup:
Modified:
tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.cpp
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.cpp
2013-05-16 09:05:06 UTC (rev 56841)
+++ tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.cpp
2013-05-16 09:34:59 UTC (rev 56842)
@@ -65,6 +65,15 @@
bool ExtraHandler::parseElement(
const char *profileName,
const unsigned long& elementHash,
+ const COLLADAFW::UniqueId& uniqueId)
+{
+ /* implement for backwards compatibility, new version added object
parameter */
+ return parseElement(profileName, elementHash, uniqueId, NULL);
+}
+
+bool ExtraHandler::parseElement(
+ const char *profileName,
+ const unsigned long& elementHash,
const COLLADAFW::UniqueId& uniqueId,
COLLADAFW::Object* object)
{
Modified:
tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.h
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.h
2013-05-16 09:05:06 UTC (rev 56841)
+++ tags/blender-2.67a-release/blender/source/blender/collada/ExtraHandler.h
2013-05-16 09:34:59 UTC (rev 56842)
@@ -63,6 +63,12 @@
const unsigned long& elementHash,
const COLLADAFW::UniqueId& uniqueId,
COLLADAFW::Object* object);
+
+ /** For backwards compatibility with older OpenCollada, new version
added object parameter */
+ bool parseElement (
+ const char* profileName,
+ const unsigned long& elementHash,
+ const COLLADAFW::UniqueId& uniqueId);
private:
/** Disable default copy constructor. */
ExtraHandler(const ExtraHandler& pre);
Modified:
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_templates.c
===================================================================
---
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_templates.c
2013-05-16 09:05:06 UTC (rev 56841)
+++
tags/blender-2.67a-release/blender/source/blender/editors/interface/interface_templates.c
2013-05-16 09:34:59 UTC (rev 56842)
@@ -3115,6 +3115,7 @@
{
ComponentMenuArgs *args = MEM_callocN(sizeof(ComponentMenuArgs),
"component menu template args");
uiBlock *block;
+ uiBut *but;
args->ptr = *ptr;
BLI_strncpy(args->propname, propname, sizeof(args->propname));
@@ -3122,7 +3123,11 @@
block = uiLayoutGetBlock(layout);
uiBlockBeginAlign(block);
- uiDefBlockButN(block, component_menu, args, name, 0, 0, UI_UNIT_X * 6,
UI_UNIT_Y, "");
+ but = uiDefBlockButN(block, component_menu, args, name, 0, 0, UI_UNIT_X
* 6, UI_UNIT_Y, "");
+ /* set rna directly, uiDefBlockButN doesn't do this */
+ but->rnapoin = *ptr;
+ but->rnaprop = RNA_struct_find_property(ptr, propname);
+ but->rnaindex = 0;
uiBlockEndAlign(block);
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
