Revision: 48238
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48238
Author: nazgul
Date: 2012-06-24 14:27:23 +0000 (Sun, 24 Jun 2012)
Log Message:
-----------
Merging r48224 through r48237 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48224
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48237
Modified Paths:
--------------
branches/soc-2011-tomato/intern/container/CTR_UHeap.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/movieclip.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/ocean.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2011-tomato/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voxel.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/collada/EffectExporter.h
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ImageExporter.h
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/collada/collada.h
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_GroupNode.cpp
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_CompositorOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingClipOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_KeyingOperation.h
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/io/io_collada.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48223
+
/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/vgroup_modifiers:38694-39989
/trunk/blender:36831-48237
Modified: branches/soc-2011-tomato/intern/container/CTR_UHeap.h
===================================================================
--- branches/soc-2011-tomato/intern/container/CTR_UHeap.h 2012-06-24
14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/intern/container/CTR_UHeap.h 2012-06-24
14:27:23 UTC (rev 48238)
@@ -53,47 +53,47 @@
class CTR_UHeapable {
-public :
- int &
+public:
+ int &
HeapPos(
- ) {
+ ) {
return m_ind;
};
- float &
+ float &
HeapKey(
- ) {
+ ) {
return m_key;
};
const
- float &
+ float &
HeapKey(
- ) const {
+ ) const {
return m_key;
};
const
- int &
+ int &
HeapPos(
- ) const {
+ ) const {
return m_ind;
};
-private :
+private:
float m_key;
int m_ind;
-protected :
+protected:
CTR_UHeapable(
- ) : m_key (0),
- m_ind (0)
+ ) : m_key(0),
+ m_ind(0)
{
};
~CTR_UHeapable(
- ) {
+ ) {
};
};
@@ -104,50 +104,50 @@
public:
static
- CTR_UHeap *
+ CTR_UHeap *
New(
- ) {
+ ) {
return new CTR_UHeap();
}
- void
+ void
MakeHeap(
- HeapType *base
- ) {
+ HeapType *base
+ ) {
int i;
- int start = Parent(m_vector.size()-1);
- for (i = start; i >=0; --i) {
- DownHeap(base,i);
+ int start = Parent(m_vector.size() - 1);
+ for (i = start; i >= 0; --i) {
+ DownHeap(base, i);
}
};
- void
+ void
Insert(
- HeapType *base,
- int elem
- ) {
+ HeapType *base,
+ int elem
+ ) {
// add element to vector
m_vector.push_back(elem);
- base[elem].HeapPos() = m_vector.size()-1;
+ base[elem].HeapPos() = m_vector.size() - 1;
// push the element up the heap
- UpHeap(base,m_vector.size()-1);
+ UpHeap(base, m_vector.size() - 1);
}
// access to the vector for initial loading of elements
- std::vector<int> &
+ std::vector<int> &
HeapVector(
- ) {
+ ) {
return m_vector;
};
- void
+ void
Remove(
- HeapType *base,
- int i
- ) {
+ HeapType *base,
+ int i
+ ) {
// exchange with last element - pop last
// element and move up or down the heap as appropriate
@@ -155,37 +155,38 @@
assert(false);
}
- if (i != int(m_vector.size())-1) {
+ if (i != int(m_vector.size()) - 1) {
- Swap(base,i,m_vector.size() - 1);
+ Swap(base, i, m_vector.size() - 1);
m_vector.pop_back();
if (!m_vector.empty()) {
- UpHeap(base,i);
- DownHeap(base,i);
+ UpHeap(base, i);
+ DownHeap(base, i);
}
- } else {
+ }
+ else {
m_vector.pop_back();
}
}
- int
+ int
Top(
- ) const {
+ ) const {
if (m_vector.empty()) return -1;
return m_vector[0];
}
- void
+ void
SC_Heap(
- HeapType *base
- ) {
+ HeapType *base
+ ) {
int i;
- for (i = 1; i < int(m_vector.size()) ; i++) {
+ for (i = 1; i < int(m_vector.size()); i++) {
- CTR_UHeapable * elem = base + m_vector[i];
- CTR_UHeapable * p_elem = base + m_vector[Parent(i)];
+ CTR_UHeapable *elem = base + m_vector[i];
+ CTR_UHeapable *p_elem = base + m_vector[Parent(i)];
assert(p_elem->HeapKey() >= elem->HeapKey());
assert(elem->HeapPos() == i);
@@ -195,27 +196,27 @@
~CTR_UHeap(
- ) {
+ ) {
};
private:
CTR_UHeap(
- ) {
+ ) {
};
std::vector<int> m_vector;
private:
- void
+ void
Swap(
- HeapType *base,
- int i,
- int j
- ) {
- std::swap(m_vector[i],m_vector[j]);
+ HeapType *base,
+ int i,
+ int j
+ ) {
+ std::swap(m_vector[i], m_vector[j]);
CTR_UHeapable *heap_i = base + m_vector[i];
CTR_UHeapable *heap_j = base + m_vector[j];
@@ -225,77 +226,78 @@
heap_j->HeapPos() = j;
}
- int
+ int
Parent(
- unsigned int i
- ) {
- return (i-1) >> 1;
+ unsigned int i
+ ) {
+ return (i - 1) >> 1;
}
- int
+ int
Left(
- int i
- ) {
- return (i<<1)+1;
+ int i
+ ) {
+ return (i << 1) + 1;
}
- int
+ int
Right(
- int i
- ) {
- return (i<<1)+2;
+ int i
+ ) {
+ return (i << 1) + 2;
}
- float
+ float
HeapVal(
- HeapType *base,
- int i
- ) {
+ HeapType *base,
+ int i
+ ) {
return base[m_vector[i]].HeapKey();
}
- void
+ void
DownHeap(
- HeapType *base,
- int i
- ) {
+ HeapType *base,
+ int i
+ ) {
int heap_size = m_vector.size();
int l = Left(i);
int r = Right(i);
int largest;
- if (l < heap_size && HeapVal(base,l) > HeapVal(base,i)) {
+ if (l < heap_size && HeapVal(base, l) > HeapVal(base, i)) {
largest = l;
- } else {
+ }
+ else {
largest = i;
}
- if (r < heap_size && HeapVal(base,r) > HeapVal(base,largest)) {
+ if (r < heap_size && HeapVal(base, r) > HeapVal(base, largest))
{
largest = r;
}
if (largest != i) {
// exchange i and largest
- Swap(base,i,largest);
- DownHeap(base,largest);
+ Swap(base, i, largest);
+ DownHeap(base, largest);
}
}
- void
+ void
UpHeap(
- HeapType *base,
- int i
- ) {
+ HeapType *base,
+ int i
+ ) {
// swap parents untill it's found a place in the heap < it's
parent or
// top of heap
while (i > 0) {
int p = Parent(i);
- if (HeapVal(base,i) < HeapVal(base,p)) {
+ if (HeapVal(base, i) < HeapVal(base, p)) {
break;
}
- Swap(base,p,i);
+ Swap(base, p, i);
i = p;
}
}
Modified: branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
===================================================================
--- branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
2012-06-24 14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemPathsX11.cpp
2012-06-24 14:27:23 UTC (rev 48238)
@@ -61,7 +61,7 @@
const GHOST_TUns8 *GHOST_SystemPathsX11::getSystemDir(int, const char
*versionstr) const
{
/* no prefix assumes a portable build which only uses bundled scripts */
- if(static_path) {
+ if (static_path) {
static char system_path[PATH_MAX];
snprintf(system_path, sizeof(system_path), "%s/blender/%s",
static_path, versionstr);
return (GHOST_TUns8*)system_path;
@@ -76,10 +76,10 @@
/* in blender 2.64, we migrate to XDG. to ensure the copy previous
settings
* operator works we give a different path depending on the requested
version */
- if(version < 264) {
+ if (version < 264) {
const char *home = getenv("HOME");
- if(home) {
+ if (home) {
snprintf(user_path, sizeof(user_path),
"%s/.blender/%s", home, versionstr);
return (GHOST_TUns8*)user_path;
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
2012-06-24 14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
2012-06-24 14:27:23 UTC (rev 48238)
@@ -51,7 +51,7 @@
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE beta
extern char versionstr[]; /* from blender.c */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
2012-06-24 14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
2012-06-24 14:27:23 UTC (rev 48238)
@@ -1882,7 +1882,7 @@
VertDataMulN(q, 0.25f, ss);
VertDataAdd(r, q, ss);
- /* nCo = nCo + (r - nCo) * avgSharpness */
+ /* nCo = nCo + (r - nCo) * avgSharpness */
VertDataSub(r, nCo, ss);
VertDataMulN(r, avgSharpness, ss);
VertDataAdd(nCo, r, ss);
@@ -2331,7 +2331,7 @@
VertDataMulN(q, 0.25f, ss);
VertDataAdd(r, q, ss);
- /* nCo = nCo + (r - nCo) * avgSharpness */
+ /* nCo = nCo + (r - nCo) * avgSharpness */
VertDataSub(r, nCo, ss);
VertDataMulN(r, avgSharpness, ss);
VertDataAdd(nCo, r, ss);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
2012-06-24 14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cloth.c
2012-06-24 14:27:23 UTC (rev 48238)
@@ -106,7 +106,7 @@
*
******************************************************************************/
/**
- * cloth_init - creates a new cloth simulation.
+ * cloth_init - creates a new cloth simulation.
*
* 1. create object
* 2. fill object with standard values or with the GUI settings if given
@@ -821,8 +821,9 @@
if (clmd->coll_parms->flags &
CLOTH_COLLSETTINGS_FLAG_SELF ) {
if ( dvert->dw[j].def_nr ==
(clmd->coll_parms->vgroup_selfcol-1)) {
- if( dvert->dw
[j].weight > 0.0)
+ if (dvert->dw
[j].weight > 0.0f) {
verts->flags |=
CLOTH_VERT_FLAG_NOSELFCOLL;
+ }
}
}
/*
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
2012-06-24 14:16:40 UTC (rev 48237)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
2012-06-24 14:27:23 UTC (rev 48238)
@@ -841,9 +841,11 @@
}
}
- if( ( cloth->verts[i].flags &
CLOTH_VERT_FLAG_NOSELFCOLL ) ||
- ( cloth->verts[j].flags
& CLOTH_VERT_FLAG_NOSELFCOLL ) )
+ if ((cloth->verts[i].flags &
CLOTH_VERT_FLAG_NOSELFCOLL) ||
+ (cloth->verts[j].flags &
CLOTH_VERT_FLAG_NOSELFCOLL))
+ {
continue;
+ }
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
