[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49480] branches/soc-2011-tomato: Merging r49463 through r49478 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 1 21:23:50 CEST 2012
Revision: 49480
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49480
Author: nazgul
Date: 2012-08-01 19:23:50 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
Merging r49463 through r49478 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49463
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49478
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_ID.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.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-49462
+ /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-49478
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-08-01 19:23:22 UTC (rev 49479)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-08-01 19:23:50 UTC (rev 49480)
@@ -761,7 +761,7 @@
BHead *blo_prevbhead(FileData *UNUSED(fd), BHead *thisblock)
{
- BHeadN *bheadn = (BHeadN *) (((char *) thisblock) - GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) );
+ BHeadN *bheadn = (BHeadN *) (((char *) thisblock) - offsetof(BHeadN, bhead));
BHeadN *prev = bheadn->prev;
return (prev) ? &prev->bhead : NULL;
@@ -773,11 +773,11 @@
BHead *bhead = NULL;
if (thisblock) {
- // bhead is actually a sub part of BHeadN
- // We calculate the BHeadN pointer from the BHead pointer below
- new_bhead = (BHeadN *) (((char *) thisblock) - GET_INT_FROM_POINTER( &((BHeadN*)0)->bhead) );
+ /* bhead is actually a sub part of BHeadN
+ * We calculate the BHeadN pointer from the BHead pointer below */
+ new_bhead = (BHeadN *) (((char *) thisblock) - offsetof(BHeadN, bhead));
- // get the next BHeadN. If it doesn't exist we read in the next one
+ /* get the next BHeadN. If it doesn't exist we read in the next one */
new_bhead = new_bhead->next;
if (new_bhead == NULL) {
new_bhead = get_bhead(fd);
@@ -785,8 +785,8 @@
}
if (new_bhead) {
- // here we do the reverse:
- // go from the BHeadN pointer to the BHead pointer
+ /* here we do the reverse:
+ * go from the BHeadN pointer to the BHead pointer */
bhead = &new_bhead->bhead;
}
@@ -1665,8 +1665,8 @@
/* only link ID pointers */
for (brush = main->brush.first; brush; brush = brush->id.next) {
- if (brush->id.flag & LIB_NEEDLINK) {
- brush->id.flag -= LIB_NEEDLINK;
+ if (brush->id.flag & LIB_NEED_LINK) {
+ brush->id.flag -= LIB_NEED_LINK;
brush->mtex.tex = newlibadr_us(fd, brush->id.lib, brush->mtex.tex);
brush->clone.image = newlibadr_us(fd, brush->id.lib, brush->clone.image);
@@ -1737,13 +1737,13 @@
Ipo *ipo;
for (ipo = main->ipo.first; ipo; ipo = ipo->id.next) {
- if (ipo->id.flag & LIB_NEEDLINK) {
+ if (ipo->id.flag & LIB_NEED_LINK) {
IpoCurve *icu;
for (icu = ipo->curve.first; icu; icu = icu->next) {
if (icu->driver)
icu->driver->ob = newlibadr(fd, ipo->id.lib, icu->driver->ob);
}
- ipo->id.flag -= LIB_NEEDLINK;
+ ipo->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -1958,8 +1958,8 @@
bActionChannel *chan;
for (act = main->action.first; act; act = act->id.next) {
- if (act->id.flag & LIB_NEEDLINK) {
- act->id.flag -= LIB_NEEDLINK;
+ if (act->id.flag & LIB_NEED_LINK) {
+ act->id.flag -= LIB_NEED_LINK;
// XXX depreceated - old animation system <<<
for (chan=act->chanbase.first; chan; chan=chan->next) {
@@ -2185,8 +2185,8 @@
/* only link ID pointers */
for (ntree = main->nodetree.first; ntree; ntree = ntree->id.next) {
- if (ntree->id.flag & LIB_NEEDLINK) {
- ntree->id.flag -= LIB_NEEDLINK;
+ if (ntree->id.flag & LIB_NEED_LINK) {
+ ntree->id.flag -= LIB_NEED_LINK;
lib_link_ntree(fd, &ntree->id, ntree);
}
}
@@ -2608,9 +2608,9 @@
bArmature *arm;
for (arm = main->armature.first; arm; arm = arm->id.next) {
- if (arm->id.flag & LIB_NEEDLINK) {
+ if (arm->id.flag & LIB_NEED_LINK) {
if (arm->adt) lib_link_animdata(fd, &arm->id, arm->adt);
- arm->id.flag -= LIB_NEEDLINK;
+ arm->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2658,14 +2658,14 @@
Camera *ca;
for (ca = main->camera.first; ca; ca = ca->id.next) {
- if (ca->id.flag & LIB_NEEDLINK) {
+ if (ca->id.flag & LIB_NEED_LINK) {
if (ca->adt) lib_link_animdata(fd, &ca->id, ca->adt);
ca->ipo = newlibadr_us(fd, ca->id.lib, ca->ipo); // XXX depreceated - old animation system
ca->dof_ob = newlibadr_us(fd, ca->id.lib, ca->dof_ob);
- ca->id.flag -= LIB_NEEDLINK;
+ ca->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2686,7 +2686,7 @@
int a;
for (la = main->lamp.first; la; la = la->id.next) {
- if (la->id.flag & LIB_NEEDLINK) {
+ if (la->id.flag & LIB_NEED_LINK) {
if (la->adt) lib_link_animdata(fd, &la->id, la->adt);
for (a = 0; a < MAX_MTEX; a++) {
@@ -2702,7 +2702,7 @@
if (la->nodetree)
lib_link_ntree(fd, &la->id, la->nodetree);
- la->id.flag -= LIB_NEEDLINK;
+ la->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2746,13 +2746,13 @@
}
}
- if (key->id.flag & LIB_NEEDLINK) {
+ if (key->id.flag & LIB_NEED_LINK) {
if (key->adt) lib_link_animdata(fd, &key->id, key->adt);
key->ipo = newlibadr_us(fd, key->id.lib, key->ipo); // XXX depreceated - old animation system
key->from = newlibadr(fd, key->id.lib, key->from);
- key->id.flag -= LIB_NEEDLINK;
+ key->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2816,7 +2816,7 @@
int a;
for (mb = main->mball.first; mb; mb = mb->id.next) {
- if (mb->id.flag & LIB_NEEDLINK) {
+ if (mb->id.flag & LIB_NEED_LINK) {
if (mb->adt) lib_link_animdata(fd, &mb->id, mb->adt);
for (a = 0; a < mb->totcol; a++)
@@ -2824,7 +2824,7 @@
mb->ipo = newlibadr_us(fd, mb->id.lib, mb->ipo); // XXX depreceated - old animation system
- mb->id.flag -= LIB_NEEDLINK;
+ mb->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2855,7 +2855,7 @@
int a;
for (wrld = main->world.first; wrld; wrld = wrld->id.next) {
- if (wrld->id.flag & LIB_NEEDLINK) {
+ if (wrld->id.flag & LIB_NEED_LINK) {
if (wrld->adt) lib_link_animdata(fd, &wrld->id, wrld->adt);
wrld->ipo = newlibadr_us(fd, wrld->id.lib, wrld->ipo); // XXX depreceated - old animation system
@@ -2871,7 +2871,7 @@
if (wrld->nodetree)
lib_link_ntree(fd, &wrld->id, wrld->nodetree);
- wrld->id.flag -= LIB_NEEDLINK;
+ wrld->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2902,8 +2902,8 @@
VFont *vf;
for (vf = main->vfont.first; vf; vf = vf->id.next) {
- if (vf->id.flag & LIB_NEEDLINK) {
- vf->id.flag -= LIB_NEEDLINK;
+ if (vf->id.flag & LIB_NEED_LINK) {
+ vf->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2921,8 +2921,8 @@
Text *text;
for (text = main->text.first; text; text = text->id.next) {
- if (text->id.flag & LIB_NEEDLINK) {
- text->id.flag -= LIB_NEEDLINK;
+ if (text->id.flag & LIB_NEED_LINK) {
+ text->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -2974,10 +2974,10 @@
Image *ima;
for (ima = main->image.first; ima; ima = ima->id.next) {
- if (ima->id.flag & LIB_NEEDLINK) {
+ if (ima->id.flag & LIB_NEED_LINK) {
if (ima->id.properties) IDP_LibLinkProperty(ima->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
- ima->id.flag -= LIB_NEEDLINK;
+ ima->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3044,7 +3044,7 @@
int a;
for (cu = main->curve.first; cu; cu = cu->id.next) {
- if (cu->id.flag & LIB_NEEDLINK) {
+ if (cu->id.flag & LIB_NEED_LINK) {
if (cu->adt) lib_link_animdata(fd, &cu->id, cu->adt);
for (a = 0; a < cu->totcol; a++)
@@ -3061,7 +3061,7 @@
cu->ipo = newlibadr_us(fd, cu->id.lib, cu->ipo); // XXX depreceated - old animation system
cu->key = newlibadr_us(fd, cu->id.lib, cu->key);
- cu->id.flag -= LIB_NEEDLINK;
+ cu->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3146,7 +3146,7 @@
Tex *tex;
for (tex = main->tex.first; tex; tex = tex->id.next) {
- if (tex->id.flag & LIB_NEEDLINK) {
+ if (tex->id.flag & LIB_NEED_LINK) {
if (tex->adt) lib_link_animdata(fd, &tex->id, tex->adt);
tex->ima = newlibadr_us(fd, tex->id.lib, tex->ima);
@@ -3163,7 +3163,7 @@
if (tex->nodetree)
lib_link_ntree(fd, &tex->id, tex->nodetree);
- tex->id.flag -= LIB_NEEDLINK;
+ tex->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3222,7 +3222,7 @@
int a;
for (ma = main->mat.first; ma; ma = ma->id.next) {
- if (ma->id.flag & LIB_NEEDLINK) {
+ if (ma->id.flag & LIB_NEED_LINK) {
if (ma->adt) lib_link_animdata(fd, &ma->id, ma->adt);
/* Link ID Properties -- and copy this comment EXACTLY for easy finding
@@ -3243,7 +3243,7 @@
if (ma->nodetree)
lib_link_ntree(fd, &ma->id, ma->nodetree);
- ma->id.flag -= LIB_NEEDLINK;
+ ma->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3365,7 +3365,7 @@
int a;
for (part = main->particle.first; part; part = part->id.next) {
- if (part->id.flag & LIB_NEEDLINK) {
+ if (part->id.flag & LIB_NEED_LINK) {
if (part->adt) lib_link_animdata(fd, &part->id, part->adt);
part->ipo = newlibadr_us(fd, part->id.lib, part->ipo); // XXX depreceated - old animation system
@@ -3447,7 +3447,7 @@
}
}
- part->id.flag -= LIB_NEEDLINK;
+ part->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3660,7 +3660,7 @@
Mesh *me;
for (me = main->mesh.first; me; me = me->id.next) {
- if (me->id.flag & LIB_NEEDLINK) {
+ if (me->id.flag & LIB_NEED_LINK) {
int i;
/* Link ID Properties -- and copy this comment EXACTLY for easy finding
@@ -3704,7 +3704,7 @@
convert_tface_mt(fd, main);
for (me = main->mesh.first; me; me = me->id.next) {
- if (me->id.flag & LIB_NEEDLINK) {
+ if (me->id.flag & LIB_NEED_LINK) {
/*
* Re-tessellate, even if the polys were just created from tessfaces, this
* is important because it:
@@ -3721,7 +3721,7 @@
BKE_mesh_tessface_clear(me);
#endif
- me->id.flag -= LIB_NEEDLINK;
+ me->id.flag -= LIB_NEED_LINK;
}
}
}
@@ -3963,13 +3963,13 @@
Lattice *lt;
for (lt = main->latt.first; lt; lt = lt->id.next) {
- if (lt->id.flag & LIB_NEEDLINK) {
+ if (lt->id.flag & LIB_NEED_LINK) {
if (lt->adt) lib_link_animdata(fd, <->id, lt->adt);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list