Revision: 41601
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41601
Author: campbellbarton
Date: 2011-11-07 04:36:37 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
minor edits
- remove unneeded type check from convert grease pencil operator.
- correct some error prints & use __func__.
- make copy_libblock take an ID* argument rather than void*.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_library.h
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/camera.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/lamp.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/speaker.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenkernel/intern/world.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/source/blender/blenkernel/BKE_library.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_library.h 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/BKE_library.h 2011-11-07
04:36:37 UTC (rev 41601)
@@ -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: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/action.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -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: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -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: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -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: trunk/blender/source/blender/blenkernel/intern/camera.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/camera.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/camera.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -68,7 +68,7 @@
{
Camera *camn;
- camn= copy_libblock(cam);
+ camn= copy_libblock(&cam->id);
return camn;
}
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -192,7 +192,7 @@
Curve *cun;
int a;
- cun= copy_libblock(cu);
+ cun= copy_libblock(&cu->id);
cun->nurb.first= cun->nurb.last= NULL;
duplicateNurblist( &(cun->nurb), &(cu->nurb));
Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/key.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -154,7 +154,7 @@
if(key==NULL) return NULL;
- keyn= copy_libblock(key);
+ keyn= copy_libblock(&key->id);
BLI_duplicatelist(&keyn->block, &key->block);
Modified: trunk/blender/source/blender/blenkernel/intern/lamp.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lamp.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/lamp.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -106,7 +106,7 @@
Lamp *lan;
int a;
- lan= copy_libblock(la);
+ lan= copy_libblock(&la->id);
for(a=0; a<MAX_MTEX; a++) {
if(lan->mtex[a]) {
@@ -132,7 +132,7 @@
Lamp *lan;
int a;
- lan= copy_libblock(la);
+ lan= copy_libblock(&la->id);
BLI_remlink(&G.main->lamp, lan);
for(a=0; a<MAX_MTEX; a++) {
Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -204,7 +204,7 @@
{
Lattice *ltn;
- ltn= copy_libblock(lt);
+ ltn= copy_libblock(<->id);
ltn->def= MEM_dupallocN(lt->def);
ltn->key= copy_key(ltn->key);
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -717,14 +717,11 @@
}
/* used everywhere in blenkernel */
-void *copy_libblock(void *rt)
+void *copy_libblock(ID *id)
{
- ID *idn, *id;
+ ID *idn;
ListBase *lb;
- char *cp, *cpn;
size_t idn_len;
-
- id= rt;
lb= which_libbase(G.main, GS(id->name));
idn= alloc_libblock(lb, GS(id->name), id->name+2);
@@ -733,8 +730,9 @@
idn_len= MEM_allocN_len(idn);
if((int)idn_len - (int)sizeof(ID) > 0) { /* signed to allow neg result
*/
- cp= (char *)id;
- cpn= (char *)idn;
+ const char *cp= (const char *)id;
+ char *cpn= (char *)idn;
+
memcpy(cpn+sizeof(ID), cp+sizeof(ID), idn_len - sizeof(ID));
}
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -215,7 +215,7 @@
Material *man;
int a;
- man= copy_libblock(ma);
+ man= copy_libblock(&ma->id);
id_lib_extern((ID *)man->group);
@@ -247,7 +247,7 @@
Material *man;
int a;
- man= copy_libblock(ma);
+ man= copy_libblock(&ma->id);
BLI_remlink(&G.main->mat, man);
/* no increment for texture ID users, in previewrender.c it prevents
decrement */
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -120,7 +120,7 @@
MetaBall *mbn;
int a;
- mbn= copy_libblock(mb);
+ mbn= copy_libblock(&mb->id);
BLI_duplicatelist(&mbn->elems, &mb->elems);
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -206,7 +206,7 @@
MTFace *tface;
int a, i;
- men= copy_libblock(me);
+ men= copy_libblock(&me->id);
men->mat= MEM_dupallocN(me->mat);
for(a=0; a<men->totcol; a++) {
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -629,7 +629,7 @@
for(newtree=G.main->nodetree.first; newtree; newtree= newtree->id.next)
if(newtree==ntree) break;
if(newtree) {
- newtree= copy_libblock(ntree);
+ newtree= copy_libblock(&ntree->id);
} else {
newtree= MEM_dupallocN(ntree);
copy_libblock_data(&newtree->id, &ntree->id, TRUE); /* copy
animdata and ID props */
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -1084,7 +1084,7 @@
ModifierData *md;
int a;
- obn= copy_libblock(ob);
+ obn= copy_libblock(&ob->id);
if(ob->totcol) {
obn->mat= MEM_dupallocN(ob->mat);
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -3569,7 +3569,7 @@
ParticleSettings *partn;
int a;
- partn= copy_libblock(part);
+ partn= copy_libblock(&part->id);
partn->pd= MEM_dupallocN(part->pd);
partn->pd2= MEM_dupallocN(part->pd2);
partn->effector_weights= MEM_dupallocN(part->effector_weights);
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -126,7 +126,7 @@
scen->r.layers= lb;
}
else {
- scen= copy_libblock(sce);
+ scen= copy_libblock(&sce->id);
BLI_duplicatelist(&(scen->base), &(sce->base));
clear_id_newpoins();
Modified: trunk/blender/source/blender/blenkernel/intern/speaker.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/speaker.c 2011-11-07
01:38:32 UTC (rev 41600)
+++ trunk/blender/source/blender/blenkernel/intern/speaker.c 2011-11-07
04:36:37 UTC (rev 41601)
@@ -69,7 +69,7 @@
{
Speaker *spkn;
- spkn= copy_libblock(spk);
+ spkn= copy_libblock(&spk->id);
if(spkn->sound)
spkn->sound->id.us++;
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-11-07
01:38:32 UTC (rev 41600)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
