Revision: 59507
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59507
Author: gdh
Date: 2013-08-26 02:23:06 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59477 to r59506.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59477
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59506
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/release/datafiles/startup.blend
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_cloth.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/collision.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object_deform.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readblenentry.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_walkers.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_filter.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
branches/soc-2013-cycles_mblur/source/blender/gpu/GPU_buffers.h
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59476
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59506
Modified: branches/soc-2013-cycles_mblur/release/datafiles/startup.blend
===================================================================
(Binary files differ)
Modified:
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
===================================================================
---
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
2013-08-25 21:29:33 UTC (rev 59506)
+++
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
2013-08-26 02:23:06 UTC (rev 59507)
@@ -576,7 +576,7 @@
# End of columns
row = layout.row(align=True)
row.prop(linestyle, "use_split_pattern", text="")
- sub = row.row()
+ sub = row.row(align=True)
sub.active = linestyle.use_split_pattern
sub.prop(linestyle, "split_dash1", text="D1")
sub.prop(linestyle, "split_gap1", text="G1")
@@ -612,7 +612,7 @@
layout.label(text="Dashed Line:")
row = layout.row(align=True)
row.prop(linestyle, "use_dashed_line", text="")
- sub = row.row()
+ sub = row.row(align=True)
sub.active = linestyle.use_dashed_line
sub.prop(linestyle, "dash1", text="D1")
sub.prop(linestyle, "gap1", text="G1")
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_cloth.h
2013-08-25 21:29:33 UTC (rev 59506)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_cloth.h
2013-08-26 02:23:06 UTC (rev 59507)
@@ -80,7 +80,7 @@
struct MFace *mfaces;
struct Implicit_Data *implicit; /* our implicit solver
connects to this pointer */
struct Implicit_Data *implicitEM; /* our implicit solver
connects to this pointer */
- struct EdgeHash *edgehash; /* used for
selfcollisions */
+ struct EdgeHash *edgehash; /* used for
selfcollisions (currently used as a 'set', value is ignored) */
int last_frame, pad4;
} Cloth;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
2013-08-25 21:29:33 UTC (rev 59506)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
2013-08-26 02:23:06 UTC (rev 59507)
@@ -32,8 +32,8 @@
* \ingroup bke
*/
+#include "BLI_utildefines.h"
#include "BLI_ghash.h"
-#include "BLI_utildefines.h"
#include "DNA_listBase.h"
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
2013-08-25 21:29:33 UTC (rev 59506)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
2013-08-26 02:23:06 UTC (rev 59507)
@@ -172,8 +172,8 @@
/* test if AABB is at least partially outside the planes' volume */
int BKE_pbvh_node_planes_exclude_AABB(PBVHNode *node, void *data);
-struct GHash *BKE_pbvh_bmesh_node_unique_verts(PBVHNode *node);
-struct GHash *BKE_pbvh_bmesh_node_other_verts(PBVHNode *node);
+struct GSet *BKE_pbvh_bmesh_node_unique_verts(PBVHNode *node);
+struct GSet *BKE_pbvh_bmesh_node_other_verts(PBVHNode *node);
void BKE_pbvh_bmesh_node_save_orig(PBVHNode *node);
void BKE_pbvh_bmesh_after_stroke(PBVH *bvh);
@@ -235,8 +235,8 @@
float *vmask;
/* bmesh */
- struct GHashIterator bm_unique_verts;
- struct GHashIterator bm_other_verts;
+ struct GSetIterator bm_unique_verts;
+ struct GSetIterator bm_other_verts;
struct CustomData *bm_vdata;
/* result: these are all computed in the macro, but we assume
@@ -294,13 +294,13 @@
vi.mask =
&vi.vmask[vi.vert_indices[vi.gx]]; \
} \
else { \
- if
(!BLI_ghashIterator_done(&vi.bm_unique_verts)) {\
- vi.bm_vert =
BLI_ghashIterator_getKey(&vi.bm_unique_verts); \
-
BLI_ghashIterator_step(&vi.bm_unique_verts); \
+ if
(!BLI_gsetIterator_done(&vi.bm_unique_verts)) {\
+ vi.bm_vert =
BLI_gsetIterator_getKey(&vi.bm_unique_verts); \
+
BLI_gsetIterator_step(&vi.bm_unique_verts); \
} \
else { \
- vi.bm_vert =
BLI_ghashIterator_getKey(&vi.bm_other_verts); \
-
BLI_ghashIterator_step(&vi.bm_other_verts); \
+ vi.bm_vert =
BLI_gsetIterator_getKey(&vi.bm_other_verts); \
+
BLI_gsetIterator_step(&vi.bm_other_verts); \
} \
if (mode == PBVH_ITER_UNIQUE && \
BM_elem_flag_test(vi.bm_vert,
BM_ELEM_HIDDEN)) \
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
---
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
2013-08-25 21:29:33 UTC (rev 59506)
+++
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
2013-08-26 02:23:06 UTC (rev 59507)
@@ -2642,7 +2642,7 @@
for (ehi = BLI_edgehashIterator_new(eh), i = 0;
BLI_edgehashIterator_isDone(ehi) == FALSE;
- BLI_edgehashIterator_step(ehi), ++i, ++med, ++index)
+ BLI_edgehashIterator_step(ehi), i++, med++, index++)
{
BLI_edgehashIterator_getKey(ehi, &med->v1, &med->v2);
Modified:
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cloth.c
2013-08-25 21:29:33 UTC (rev 59506)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cloth.c
2013-08-26 02:23:06 UTC (rev 59507)
@@ -975,6 +975,18 @@
* SPRING NETWORK BUILDING IMPLEMENTATION BEGIN
***************************************************************************************/
+BLI_INLINE void spring_verts_ordered_set(ClothSpring *spring, int v0, int v1)
+{
+ if (v0 < v1) {
+ spring->ij = v0;
+ spring->kl = v1;
+ }
+ else {
+ spring->ij = v1;
+ spring->kl = v0;
+ }
+}
+
// be careful: implicit solver has to be resettet when using this one!
// --> only for implicit handling of this spring!
int cloth_add_spring(ClothModifierData *clmd, unsigned int indexA, unsigned
int indexB, float restlength, int spring_type)
@@ -1120,8 +1132,7 @@
spring = (ClothSpring *)MEM_callocN ( sizeof ( ClothSpring ),
"cloth spring" );
if ( spring ) {
- spring->ij = MIN2(medge[i].v1, medge[i].v2);
- spring->kl = MAX2(medge[i].v2, medge[i].v1);
+ spring_verts_ordered_set(spring, medge[i].v1,
medge[i].v2);
spring->restlen =
len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest);
clmd->sim_parms->avg_spring_len += spring->restlen;
cloth->verts[spring->ij].avg_spring_len +=
spring->restlen;
@@ -1161,8 +1172,7 @@
return 0;
}
- spring->ij = MIN2(mface[i].v1, mface[i].v3);
- spring->kl = MAX2(mface[i].v3, mface[i].v1);
+ spring_verts_ordered_set(spring, mface[i].v1, mface[i].v3);
spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest,
cloth->verts[spring->ij].xrest);
spring->type = CLOTH_SPRING_TYPE_SHEAR;
spring->stiffness = (cloth->verts[spring->kl].shear_stiff +
cloth->verts[spring->ij].shear_stiff) / 2.0f;
@@ -1182,8 +1192,7 @@
return 0;
}
- spring->ij = MIN2(mface[i].v2, mface[i].v4);
- spring->kl = MAX2(mface[i].v4, mface[i].v2);
+ spring_verts_ordered_set(spring, mface[i].v2, mface[i].v4);
spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest,
cloth->verts[spring->ij].xrest);
spring->type = CLOTH_SPRING_TYPE_SHEAR;
spring->stiffness = (cloth->verts[spring->kl].shear_stiff +
cloth->verts[spring->ij].shear_stiff) / 2.0f;
@@ -1214,7 +1223,7 @@
// check for existing spring
// check also if startpoint is equal to endpoint
if ((index2 != tspring2->ij) &&
- !BLI_edgehash_haskey(edgehash,
MIN2(tspring2->ij, index2), MAX2(tspring2->ij, index2)))
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
