Revision: 45328
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45328
Author: elubie
Date: 2012-04-02 06:07:07 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
merge from trunk: rev. 5308-45320
Modified Paths:
--------------
branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-avocado/blender/source/blender/python/mathutils/mathutils_Matrix.c
Property Changed:
----------------
branches/soc-2011-avocado/blender/
branches/soc-2011-avocado/blender/release/
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-avocado/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bmesh/blender:36841-39505,39507-45292
/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
/trunk/blender:39992-44252,44257-45298,45300-45306
+ /branches/bmesh/blender:36841-39505,39507-45292
/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
/trunk/blender:39992-44252,44257-45298,45300-45306,45308-45320
Property changes on: branches/soc-2011-avocado/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/bmesh/blender/release:36841-39505,39507-45292
/branches/soc-2011-cucumber/release: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/release: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
/trunk/blender/release:31524-44252,44257-45298,45300-45306
+ /branches/bmesh/blender/release:36841-39505,39507-45292
/branches/soc-2011-cucumber/release: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/release: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
/trunk/blender/release:31524-44252,44257-45298,45300-45306,45308-45320
Modified:
branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
2012-04-02 06:03:36 UTC (rev 45327)
+++ branches/soc-2011-avocado/blender/source/blender/blenfont/intern/blf_lang.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -104,7 +104,7 @@
"persian", "fa_IR",
"indonesian", "id_ID",
"serbian (latin)", "sr_RS@latin",
- "kyrgyz", "ky",
+ "kyrgyz", "ky_KG",
};
void BLF_lang_init(void)
Modified:
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
---
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-04-02 06:03:36 UTC (rev 45327)
+++
branches/soc-2011-avocado/blender/source/blender/blenkernel/intern/DerivedMesh.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -382,6 +382,13 @@
__func__, numPolys, dm->type);
}
}
+
+ else if (dm->dirty && DM_DIRTY_TESS_CDLAYERS) {
+ BLI_assert(CustomData_has_layer(&dm->faceData, CD_POLYINDEX));
+ DM_update_tessface_data(dm);
+ }
+
+ dm->dirty &= ~DM_DIRTY_TESS_CDLAYERS;
}
/* Update tessface CD data from loop/poly ones. Needed when not retessellating
after modstack evaluation. */
@@ -1629,7 +1636,7 @@
deformedVerts = NULL;
}
- }
+ }
/* create an orco derivedmesh in parallel */
if (nextmask & CD_MASK_ORCO) {
@@ -3061,6 +3068,8 @@
}
}
}
+
+ dm->dirty |= DM_DIRTY_TESS_CDLAYERS;
}
Modified:
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_matrix.h
2012-04-02 06:03:36 UTC (rev 45327)
+++ branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_math_matrix.h
2012-04-02 06:07:07 UTC (rev 45328)
@@ -123,6 +123,8 @@
int is_orthogonal_m3(float mat[3][3]);
int is_orthogonal_m4(float mat[4][4]);
+int is_orthonormal_m3(float mat[3][3]);
+int is_orthonormal_m4(float mat[4][4]);
void adjoint_m3_m3(float R[3][3], float A[3][3]);
void adjoint_m4_m4(float R[4][4], float A[4][4]);
Modified:
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_matrix.c
===================================================================
---
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_matrix.c
2012-04-02 06:03:36 UTC (rev 45327)
+++
branches/soc-2011-avocado/blender/source/blender/blenlib/intern/math_matrix.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -816,9 +816,6 @@
if (fabsf(dot_v3v3(m[i], m[j])) > 1.5f * FLT_EPSILON)
return 0;
}
-
- if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f * FLT_EPSILON)
- return 0;
}
return 1;
@@ -834,13 +831,41 @@
return 0;
}
- if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f * FLT_EPSILON)
- return 0;
}
return 1;
}
+int is_orthonormal_m3(float m[][3])
+{
+ if (is_orthogonal_m3(m)) {
+ int i;
+
+ for (i = 0; i < 3; i++)
+ if (fabsf(dot_v3v3(m[i], m[i]) - 1) > 1.5f *
FLT_EPSILON)
+ return 0;
+
+ return 1;
+ }
+
+ return 0;
+}
+
+int is_orthonormal_m4(float m[][4])
+{
+ if (is_orthogonal_m4(m)) {
+ int i;
+
+ for (i = 0; i < 4; i++)
+ if (fabsf(dot_vn_vn(m[i], m[i], 4) - 1) > 1.5f *
FLT_EPSILON)
+ return 0;
+
+ return 1;
+ }
+
+ return 0;
+}
+
void normalize_m3(float mat[][3])
{
normalize_v3(mat[0]);
Modified:
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
===================================================================
---
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
2012-04-02 06:03:36 UTC (rev 45327)
+++
branches/soc-2011-avocado/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -256,10 +256,10 @@
BM_elem_index_set(f, bm->totface - 1); /* set_ok */
/* transfer flag */
- f->head.hflag = BM_face_flag_from_mflag(mpoly->flag & ~SELECT);
+ f->head.hflag = BM_face_flag_from_mflag(mpoly->flag &
~ME_FACE_SEL);
/* this is necessary for selection counts to work properly */
- if (mpoly->flag & SELECT) {
+ if (mpoly->flag & ME_FACE_SEL) {
BM_elem_select_set(bm, f, TRUE);
}
Modified:
branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmo_dupe.c
2012-04-02 06:03:36 UTC (rev 45327)
+++ branches/soc-2011-avocado/blender/source/blender/bmesh/operators/bmo_dupe.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -195,15 +195,14 @@
GHash *vhash, *ehash;
/* initialize pointer hashes */
- vhash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
- "bmesh dupeops v");
- ehash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
- "bmesh dupeops e");
+ vhash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"bmesh dupeops v");
+ ehash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"bmesh dupeops e");
/* duplicate flagged vertices */
BM_ITER(v, &viter, source, BM_VERTS_OF_MESH, source) {
if (BMO_elem_flag_test(source, v, DUPE_INPUT) &&
- !BMO_elem_flag_test(source, v, DUPE_DONE)) {
+ !BMO_elem_flag_test(source, v, DUPE_DONE))
+ {
BMIter iter;
int isolated = 1;
@@ -236,7 +235,8 @@
/* now we dupe all the edges */
BM_ITER(e, &eiter, source, BM_EDGES_OF_MESH, source) {
if (BMO_elem_flag_test(source, e, DUPE_INPUT) &&
- !BMO_elem_flag_test(source, e, DUPE_DONE)) {
+ !BMO_elem_flag_test(source, e, DUPE_DONE))
+ {
/* make sure that verts are copied */
if (!BMO_elem_flag_test(source, e->v1, DUPE_DONE)) {
copy_vertex(source, e->v1, target, vhash);
Property changes on:
branches/soc-2011-avocado/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/bmesh/blender/source/blender/editors/space_outliner:36841-39505,39507-45292
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43664,43888-43918,44025-44076,44137-44204,44236-44250,44257-45298,45300-45306
+
/branches/bmesh/blender/source/blender/editors/space_outliner:36841-39505,39507-45292
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner: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
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43664,43888-43918,44025-44076,44137-44204,44236-44250,44257-45298,45300-45306,45308-45320
Modified:
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
---
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_userdef.c
2012-04-02 06:03:36 UTC (rev 45327)
+++
branches/soc-2011-avocado/blender/source/blender/makesrna/intern/rna_userdef.c
2012-04-02 06:07:07 UTC (rev 45328)
@@ -2880,7 +2880,7 @@
{23, "GREEK", 0, "Greek (Ελληνικά)", "el_GR"},
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
