Revision: 41608
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41608
Author: nazgul
Date: 2011-11-07 12:49:52 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Merging r41597 through r41607 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41597
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41607
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_vector.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2011-tomato/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_lattice.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_info/textview.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
branches/soc-2011-tomato/source/blender/editors/util/crazyspace.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-tomato/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-tomato/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41596
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41607
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
2011-11-07 12:49:52 UTC (rev 41608)
@@ -46,7 +46,7 @@
struct PropertyRNA;
void *alloc_libblock(struct ListBase *lb, short type, const char *name);
-void *copy_libblock(void *rt);
+void *copy_libblock(struct ID *id);
void copy_libblock_data(struct ID *id, const struct ID *id_from, const short
do_action);
void BKE_id_lib_local_paths(struct Main *bmain, struct ID *id);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
2011-11-07 12:49:52 UTC (rev 41608)
@@ -185,7 +185,7 @@
if (src == NULL)
return NULL;
- dst= copy_libblock(src);
+ dst= copy_libblock(&src->id);
/* duplicate the lists of groups and markers */
BLI_duplicatelist(&dst->groups, &src->groups);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
2011-11-07 12:49:52 UTC (rev 41608)
@@ -204,7 +204,7 @@
Bone *oldBone, *newBone;
Bone *newActBone= NULL;
- newArm= copy_libblock (arm);
+ newArm= copy_libblock(&arm->id);
BLI_duplicatelist(&newArm->bonebase, &arm->bonebase);
/* Duplicate the childrens' lists*/
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
2011-11-07 12:49:52 UTC (rev 41608)
@@ -144,7 +144,7 @@
{
Brush *brushn;
- brushn= copy_libblock(brush);
+ brushn= copy_libblock(&brush->id);
if (brush->mtex.tex)
id_us_plus((ID*)brush->mtex.tex);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
2011-11-07 12:49:52 UTC (rev 41608)
@@ -68,7 +68,7 @@
{
Camera *camn;
- camn= copy_libblock(cam);
+ camn= copy_libblock(&cam->id);
return camn;
}
Modified:
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-07 11:08:33 UTC (rev 41607)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
2011-11-07 12:49:52 UTC (rev 41608)
@@ -152,7 +152,7 @@
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
- VECCOPY(co_r, cddm->mvert[index].co);
+ copy_v3_v3(co_r, cddm->mvert[index].co);
}
static void cdDM_getVertCos(DerivedMesh *dm, float (*cos_r)[3])
@@ -161,7 +161,7 @@
int i;
for(i = 0; i < dm->numVertData; i++, mv++)
- VECCOPY(cos_r[i], mv->co);
+ copy_v3_v3(cos_r[i], mv->co);
}
static void cdDM_getVertNo(DerivedMesh *dm, int index, float no_r[3])
@@ -1246,39 +1246,39 @@
if( numdata != 0 ) {
offset = 0;
if(attribs.totorco) {
- VECCOPY((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v2]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v3]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v1]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v2]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v3]);
offset += sizeof(float)*3;
}
for(b = 0; b < attribs.tottface; b++) {
MTFace *tf =
&attribs.tface[b].array[a];
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset],tf->uv[0]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset],tf->uv[0]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[1]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[2]);
offset += sizeof(float)*2;
}
for(b = 0; b < attribs.totmcol; b++) {
MCol *cp =
&attribs.mcol[b].array[a*4 + 0];
GLubyte col[4];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset], (char *)col);
cp = &attribs.mcol[b].array[a*4
+ 1];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
cp = &attribs.mcol[b].array[a*4
+ 2];
col[0]= cp->b; col[1]= cp->g;
col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize*2], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
offset += sizeof(unsigned
char)*4;
}
if(attribs.tottang) {
float *tang =
attribs.tang.array[a*4 + 0];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset], tang);
tang = attribs.tang.array[a*4 +
1];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
tang = attribs.tang.array[a*4 +
2];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset += sizeof(float)*4;
}
(void)offset;
@@ -1288,38 +1288,38 @@
if( numdata != 0 ) {
offset = 0;
if(attribs.totorco) {
- VECCOPY((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v4]);
- VECCOPY((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v1]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3],(float *)attribs.orco.array[mface->v3]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize],(float
*)attribs.orco.array[mface->v4]);
+ copy_v3_v3((float
*)&varray[elementsize*curface*3+elementsize*2],(float
*)attribs.orco.array[mface->v1]);
offset +=
sizeof(float)*3;
}
for(b = 0; b <
attribs.tottface; b++) {
MTFace *tf =
&attribs.tface[b].array[a];
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset],tf->uv[2]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
- VECCOPY2D((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset],tf->uv[2]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize],tf->uv[3]);
+ copy_v2_v2((float
*)&varray[elementsize*curface*3+offset+elementsize*2],tf->uv[0]);
offset +=
sizeof(float)*2;
}
for(b = 0; b < attribs.totmcol;
b++) {
MCol *cp =
&attribs.mcol[b].array[a*4 + 2];
GLubyte col[4];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset], (char *)col);
cp =
&attribs.mcol[b].array[a*4 + 3];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize], (char *)col);
cp =
&attribs.mcol[b].array[a*4 + 0];
col[0]= cp->b; col[1]=
cp->g; col[2]= cp->r; col[3]= cp->a;
- QUATCOPY((unsigned char
*)&varray[elementsize*curface*3+offset+elementsize*2], col);
+ copy_v4_v4_char((char
*)&varray[elementsize*curface*3+offset+elementsize*2], (char *)col);
offset +=
sizeof(unsigned char)*4;
}
if(attribs.tottang) {
float *tang =
attribs.tang.array[a*4 + 2];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset], tang);
tang =
attribs.tang.array[a*4 + 3];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize], tang);
tang =
attribs.tang.array[a*4 + 0];
- QUATCOPY((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
+ copy_v4_v4((float
*)&varray[elementsize*curface*3+offset+elementsize*2], tang);
offset +=
sizeof(float)*4;
}
(void)offset;
@@ -1439,7 +1439,7 @@
else
orig = i;
- VECCOPY(cent, mv[mf->v1].co);
+ copy_v3_v3(cent, mv[mf->v1].co);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
