[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [10963] branches/2-44-stable/blender/ source/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Tue Jun 19 01:22:40 CEST 2007
Revision: 10963
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10963
Author: bdiego
Date: 2007-06-19 01:22:40 +0200 (Tue, 19 Jun 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 10875:10876
Fixed outliner update.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10876
revision 10877:10878
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10878
revision 10878:10879
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10879
revision 10879:10880
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10880
revision 10880:10881
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10881
revision 10881:10882 (Bugfix #6809)
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10882
revision 10885:10886
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10886
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10875
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10877
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10878
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10879
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10880
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10881
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10885
Modified Paths:
--------------
branches/2-44-stable/blender/source/blender/blenkernel/intern/exotic.c
branches/2-44-stable/blender/source/blender/blenkernel/intern/library.c
branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c
branches/2-44-stable/blender/source/blender/render/intern/source/texture.c
branches/2-44-stable/blender/source/blender/src/buttons_script.c
branches/2-44-stable/blender/source/blender/src/editipo_mods.c
branches/2-44-stable/blender/source/blender/src/editobject.c
branches/2-44-stable/blender/source/blender/src/playanim.c
Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/exotic.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/exotic.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -1246,7 +1246,12 @@
error("Can't read file\n");
return;
}
+
filelen= BLI_filesize(file);
+ if(filelen < 1) {
+ close(file);
+ return;
+ }
maindata= MEM_mallocN(filelen, "leesInventor");
read(file, maindata, filelen);
Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/library.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/library.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -915,12 +915,17 @@
/* if no libdata given, look up based on ID */
if(lb==NULL) lb= wich_libbase(G.main, GS(id->name));
- if(tname==0) /* if no name given, use name of current ID */
+ if(tname==0) { /* if no name given, use name of current ID */
strncpy(name, id->name+2, 21);
- else /* else make a copy (tname args can be const) */
+ result= strlen(id->name+2);
+ }
+ else { /* else make a copy (tname args can be const) */
strncpy(name, tname, 21);
+ result= strlen(tname);
+ }
- if( strlen(name) > 21 ) name[21]= 0;
+ /* if result > 21, strncpy don't put the final '\0' to name. */
+ if( result > 21 ) name[21]= 0;
result = check_for_dupid( lb, id, name );
strcpy( id->name+2, name );
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Noise.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -435,7 +435,7 @@
da[0], da[1], da[2], da[3],
pa[0], pa[1], pa[2],
pa[3], pa[4], pa[5],
- pa[6], pa[7], pa[8], pa[9], pa[10], pa[12] );
+ pa[6], pa[7], pa[8], pa[9], pa[10], pa[11] );
}
/*-------------------------------------------------------------------------*/
Modified: branches/2-44-stable/blender/source/blender/render/intern/source/texture.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/texture.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/texture.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -2434,6 +2434,7 @@
texvec[0]= 0.5+0.5*shi->uv[0].uv[0];
texvec[1]= 0.5+0.5*shi->uv[0].uv[1];
+ texvec[2] = 0; // initalize it because imagewrap looks at it.
if(shi->osatex) {
dx[0]= 0.5*shi->uv[0].dxuv[0];
dx[1]= 0.5*shi->uv[0].dxuv[1];
Modified: branches/2-44-stable/blender/source/blender/src/buttons_script.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/buttons_script.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/src/buttons_script.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -265,6 +265,7 @@
}
allqueue(REDRAWBUTSSCRIPT, 0);
+ allqueue(REDRAWOOPS, 0);
}
void draw_scriptlink(uiBlock *block, ScriptLink *script, int sx, int sy, int scene)
Modified: branches/2-44-stable/blender/source/blender/src/editipo_mods.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editipo_mods.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/src/editipo_mods.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -79,15 +79,13 @@
void ipo_toggle_showkey(void)
{
- if(G.sipo->showkey) {
- G.sipo->showkey= 0;
- swap_selectall_editipo(); /* sel all */
- }
+ if(G.sipo->showkey) G.sipo->showkey= 0;
else G.sipo->showkey= 1;
+
free_ipokey(&G.sipo->ipokey);
if(G.sipo->ipo) G.sipo->ipo->showkey= G.sipo->showkey;
- BIF_undo_push("Toggle show key Ipo");
+ BIF_undo_push("Toggle Show Key Ipo");
}
void swap_selectall_editipo(void)
Modified: branches/2-44-stable/blender/source/blender/src/editobject.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editobject.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/src/editobject.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -5184,18 +5184,17 @@
}
else {
base->object->ipoflag &= ~OB_DRAWKEY;
+ if(base->object->ipo) base->object->ipo->showkey= 0;
}
}
base= base->next;
}
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSOBJECT, 0);
- if(set) {
- allqueue(REDRAWNLA, 0);
- allqueue (REDRAWACTION, 0);
- allspace(REMAKEIPO, 0);
- allqueue(REDRAWIPO, 0);
- }
+ allqueue(REDRAWNLA, 0);
+ allqueue (REDRAWACTION, 0);
+ allspace(REMAKEIPO, 0);
+ allqueue(REDRAWIPO, 0);
}
void select_select_keys(void)
Modified: branches/2-44-stable/blender/source/blender/src/playanim.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/playanim.c 2007-06-18 20:48:56 UTC (rev 10962)
+++ branches/2-44-stable/blender/source/blender/src/playanim.c 2007-06-18 23:22:40 UTC (rev 10963)
@@ -271,6 +271,13 @@
return;
}
size = BLI_filesize(file);
+
+ if (size < 1) {
+ close(file);
+ MEM_freeN(picture);
+ return;
+ }
+
picture->size = size;
picture->IB_flags = IB_rect;
More information about the Bf-blender-cvs
mailing list