Revision: 50157
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50157
Author: nazgul
Date: 2012-08-23 13:51:41 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
Merging r50149 through r50156 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50149
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50156
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/ikplugin/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer.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-50148
+
/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-50156
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
2012-08-23 13:32:54 UTC (rev 50156)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
2012-08-23 13:51:41 UTC (rev 50157)
@@ -790,7 +790,7 @@
return {'CANCELLED'}
if sys.platform[:3] == "win":
- subprocess.Popen(["start", filepath], shell=True)
+ os.startfile(filepath)
elif sys.platform == "darwin":
subprocess.Popen(["open", filepath])
else:
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
2012-08-23 13:32:54 UTC (rev 50156)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
2012-08-23 13:51:41 UTC (rev 50157)
@@ -99,7 +99,7 @@
* (there should be (sub element count)^2 weights per element)
* count gives the number of elements in sources
*/
- void (*interp)(void **sources, float *weights, float *sub_weights,
+ void (*interp)(void **sources, const float *weights, const float
*sub_weights,
int count, void *dest);
/* a function to swap the data in corners of the element */
@@ -203,8 +203,8 @@
MEM_freeN(link);
}
-static void layerInterp_mdeformvert(void **sources, float *weights,
- float *UNUSED(sub_weights), int count,
void *dest)
+static void layerInterp_mdeformvert(void **sources, const float *weights,
+ const float *UNUSED(sub_weights), int
count, void *dest)
{
MDeformVert *dvert = dest;
LinkNode *dest_dw = NULL; /* a list of lists of MDeformWeight pointers
*/
@@ -261,8 +261,8 @@
}
-static void layerInterp_msticky(void **sources, float *weights,
- float *UNUSED(sub_weights), int count, void
*dest)
+static void layerInterp_msticky(void **sources, const float *weights,
+ const float *UNUSED(sub_weights), int count,
void *dest)
{
float co[2], w;
MSticky *mst;
@@ -291,13 +291,13 @@
dest_tf[i] = source_tf[i];
}
-static void layerInterp_tface(void **sources, float *weights,
- float *sub_weights, int count, void *dest)
+static void layerInterp_tface(void **sources, const float *weights,
+ const float *sub_weights, int count, void *dest)
{
MTFace *tf = dest;
int i, j, k;
float uv[4][2] = {{0.0f}};
- float *sub_weight;
+ const float *sub_weight;
if (count <= 0) return;
@@ -392,13 +392,13 @@
dest_tf[i] = source_tf[i];
}
-static void layerInterp_origspace_face(void **sources, float *weights,
- float *sub_weights, int count, void
*dest)
+static void layerInterp_origspace_face(void **sources, const float *weights,
+ const float *sub_weights, int count,
void *dest)
{
OrigSpaceFace *osf = dest;
int i, j, k;
float uv[4][2] = {{0.0f}};
- float *sub_weight;
+ const float *sub_weight;
if (count <= 0) return;
@@ -680,12 +680,12 @@
}
-static void layerInterp_mloopcol(void **sources, float *weights,
- float *sub_weights, int count, void *dest)
+static void layerInterp_mloopcol(void **sources, const float *weights,
+ const float *sub_weights, int count, void
*dest)
{
MLoopCol *mc = dest;
int i;
- float *sub_weight;
+ const float *sub_weight;
struct {
float a;
float r;
@@ -768,8 +768,8 @@
add_v2_v2(l1->uv, l2->uv);
}
-static void layerInterp_mloopuv(void **sources, float *weights,
- float *sub_weights, int count, void *dest)
+static void layerInterp_mloopuv(void **sources, const float *weights,
+ const float *sub_weights, int count, void
*dest)
{
MLoopUV *mluv = dest;
float *uv = mluv->uv;
@@ -838,8 +838,8 @@
add_v2_v2(l1->uv, l2->uv);
}
-static void layerInterp_mloop_origspace(void **sources, float *weights,
- float *sub_weights, int count, void
*dest)
+static void layerInterp_mloop_origspace(void **sources, const float *weights,
+ const float *sub_weights, int count,
void *dest)
{
OrigSpaceLoop *mluv = dest;
float *uv = mluv->uv;
@@ -866,8 +866,8 @@
}
/* --- end copy */
-static void layerInterp_mcol(void **sources, float *weights,
- float *sub_weights, int count, void *dest)
+static void layerInterp_mcol(void **sources, const float *weights,
+ const float *sub_weights, int count, void *dest)
{
MCol *mc = dest;
int i, j, k;
@@ -878,7 +878,7 @@
float b;
} col[4] = {{0.0f}};
- float *sub_weight;
+ const float *sub_weight;
if (count <= 0) return;
@@ -946,8 +946,8 @@
}
}
-static void layerInterp_bweight(void **sources, float *weights,
- float *UNUSED(sub_weights), int count, void
*dest)
+static void layerInterp_bweight(void **sources, const float *weights,
+ const float *UNUSED(sub_weights), int count,
void *dest)
{
float *f = dest;
float **in = (float **)sources;
@@ -969,8 +969,8 @@
}
}
-static void layerInterp_shapekey(void **sources, float *weights,
- float *UNUSED(sub_weights), int count, void
*dest)
+static void layerInterp_shapekey(void **sources, const float *weights,
+ const float *UNUSED(sub_weights), int count,
void *dest)
{
float *co = dest;
float **in = (float **)sources;
@@ -1003,8 +1003,8 @@
}
}
-static void layerInterp_mvert_skin(void **sources, float *weights,
- float *UNUSED(sub_weights),
+static void layerInterp_mvert_skin(void **sources, const float *weights,
+ const float *UNUSED(sub_weights),
int count, void *dest)
{
float radius[3], w;
Modified: branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
2012-08-23 13:32:54 UTC (rev 50156)
+++ branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
2012-08-23 13:51:41 UTC (rev 50157)
@@ -46,7 +46,7 @@
#include "intern/bmesh_private.h"
/* edge and vertex share, currently theres no need to have different logic */
-static void bm_data_interp_from_elem(BMesh *bm, BMElem *ele1, BMElem *ele2,
BMElem *ele_dst, const float fac)
+static void bm_data_interp_from_elem(CustomData *data_layer, BMElem *ele1,
BMElem *ele2, BMElem *ele_dst, const float fac)
{
if (ele1->head.data && ele2->head.data) {
/* first see if we can avoid interpolation */
@@ -55,8 +55,8 @@
/* do nothing */
}
else {
- CustomData_bmesh_free_block(&bm->vdata,
&ele_dst->head.data);
- CustomData_bmesh_copy_data(&bm->vdata,
&bm->vdata, ele1->head.data, &ele_dst->head.data);
+ CustomData_bmesh_free_block(data_layer,
&ele_dst->head.data);
+ CustomData_bmesh_copy_data(data_layer,
data_layer, ele1->head.data, &ele_dst->head.data);
}
}
else if (fac >= 1.0f) {
@@ -64,8 +64,8 @@
/* do nothing */
}
else {
- CustomData_bmesh_free_block(&bm->vdata,
&ele_dst->head.data);
- CustomData_bmesh_copy_data(&bm->vdata,
&bm->vdata, ele2->head.data, &ele_dst->head.data);
+ CustomData_bmesh_free_block(data_layer,
&ele_dst->head.data);
+ CustomData_bmesh_copy_data(data_layer,
data_layer, ele2->head.data, &ele_dst->head.data);
}
}
else {
@@ -76,7 +76,7 @@
src[1] = ele2->head.data;
w[0] = 1.0f - fac;
w[1] = fac;
- CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2,
ele_dst->head.data);
+ CustomData_bmesh_interp(data_layer, src, w, NULL, 2,
ele_dst->head.data);
}
}
}
@@ -90,7 +90,7 @@
*/
void BM_data_interp_from_verts(BMesh *bm, BMVert *v1, BMVert *v2, BMVert *v,
const float fac)
{
- bm_data_interp_from_elem(bm, (BMElem *)v1, (BMElem *)v2, (BMElem *)v,
fac);
+ bm_data_interp_from_elem(&bm->vdata, (BMElem *)v1, (BMElem *)v2,
(BMElem *)v, fac);
}
/**
@@ -102,7 +102,7 @@
*/
void BM_data_interp_from_edges(BMesh *bm, BMEdge *e1, BMEdge *e2, BMEdge *e,
const float fac)
{
- bm_data_interp_from_elem(bm, (BMElem *)e1, (BMElem *)e2, (BMElem *)e,
fac);
+ bm_data_interp_from_elem(&bm->edata, (BMElem *)e1, (BMElem *)e2,
(BMElem *)e, fac);
}
/**
Property changes on:
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50148
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
