Revision: 15554
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15554
Author: bdiego
Date: 2008-07-13 18:57:24 +0200 (Sun, 13 Jul 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 15521
Revision: 15523
Revision: 15524
Revision: 15527
Revision: 15529
Revision: 15537
Revision: 15543
Revision: 15545
Revision: 15548
Revision: 15553
Modified Paths:
--------------
branches/blender-2.47/README
branches/blender-2.47/source/blender/blenkernel/intern/pointcache.c
branches/blender-2.47/source/blender/blenlib/intern/util.c
branches/blender-2.47/source/blender/render/intern/source/convertblender.c
branches/blender-2.47/source/blender/src/buttons_editing.c
branches/blender-2.47/source/blender/src/buttons_shading.c
branches/blender-2.47/source/blender/src/editsound.c
branches/blender-2.47/source/blender/src/space.c
branches/blender-2.47/source/blender/src/vpaint.c
branches/blender-2.47/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
Modified: branches/blender-2.47/README
===================================================================
--- branches/blender-2.47/README 2008-07-13 14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/README 2008-07-13 16:57:24 UTC (rev 15554)
@@ -24,22 +24,22 @@
-------------------------------------Links--------------------------------------
Getting Involved:
-http://www.blender.org/docs/get_involved.html
+http://www.blender.org/community/get-involved
Community:
-http://www.blender3d.org/Community/
+http://www.blender.org/Community
Main blender development site:
-http://www.blender.org/
+http://www.blender.org
The Blender project homepage:
-http://projects.blender.org/projects/bf-blender/
+http://projects.blender.org/projects/bf-blender
Documentation:
-http://www.blender.org/modules.php?op=modload&name=documentation&file=index
+http://www.blender.org/education-help
Bug tracker:
-http://projects.blender.org/tracker/?atid=125&group_id=9&func=browse
+http://www.blender.org/development/report-a-bug
Feature request tracker:
-http://projects.blender.org/tracker/?atid=128&group_id=9&func=browse
+http://wiki.blender.org/index.php/Requests
Modified: branches/blender-2.47/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/pointcache.c
2008-07-13 14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/blenkernel/intern/pointcache.c
2008-07-13 16:57:24 UTC (rev 15554)
@@ -459,9 +459,10 @@
PTCacheID pid;
ParticleSystem *psys;
ModifierData *md;
- int reset;
+ int reset, skip;
reset= 0;
+ skip= 0;
if(ob->soft) {
BKE_ptcache_id_from_softbody(&pid, ob, ob->soft);
@@ -469,11 +470,18 @@
}
for(psys=ob->particlesystem.first; psys; psys=psys->next) {
- BKE_ptcache_id_from_particles(&pid, ob, psys);
- reset |= BKE_ptcache_id_reset(&pid, mode);
-
+ /* Baked softbody hair has to be checked first, because we
don't want to reset */
+ /* particles or softbody in that case -jahka */
if(psys->soft) {
BKE_ptcache_id_from_softbody(&pid, ob, psys->soft);
+ if(mode == PSYS_RESET_ALL || !(psys->part->type ==
PART_HAIR && (pid.cache->flag & PTCACHE_BAKED)))
+ reset |= BKE_ptcache_id_reset(&pid, mode);
+ else
+ skip = 1;
+ }
+
+ if(skip == 0) {
+ BKE_ptcache_id_from_particles(&pid, ob, psys);
reset |= BKE_ptcache_id_reset(&pid, mode);
}
}
Modified: branches/blender-2.47/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender-2.47/source/blender/blenlib/intern/util.c 2008-07-13
14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/blenlib/intern/util.c 2008-07-13
16:57:24 UTC (rev 15554)
@@ -1722,6 +1722,7 @@
path = br_find_exe( NULL );
if (path) {
strcpy(fullname, path);
+ free(path);
return;
}
#endif
Modified:
branches/blender-2.47/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/blender-2.47/source/blender/render/intern/source/convertblender.c
2008-07-13 14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/render/intern/source/convertblender.c
2008-07-13 16:57:24 UTC (rev 15554)
@@ -203,6 +203,7 @@
else stargrid *= 1.0; /* then it draws fewer
*/
if(re) MTC_Mat4Invert(mat, re->viewmat);
+ else MTC_Mat4One(mat);
/* BOUNDING BOX CALCULATION
* bbox goes from z = loc_near_var | loc_far_var,
Modified: branches/blender-2.47/source/blender/src/buttons_editing.c
===================================================================
--- branches/blender-2.47/source/blender/src/buttons_editing.c 2008-07-13
14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/src/buttons_editing.c 2008-07-13
16:57:24 UTC (rev 15554)
@@ -513,7 +513,6 @@
} else {
editmesh_deselect_by_material(G.obedit->actcol-1);
}
- allqueue(REDRAWVIEW3D, 0);
}
else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
nu= editNurb.first;
@@ -553,8 +552,9 @@
nu= nu->next;
}
BIF_undo_push("Select material index");
- allqueue(REDRAWVIEW3D, 0);
}
+ allqueue(REDRAWIMAGE, 0);
+ allqueue(REDRAWVIEW3D, 0);
}
countall();
break;
Modified: branches/blender-2.47/source/blender/src/buttons_shading.c
===================================================================
--- branches/blender-2.47/source/blender/src/buttons_shading.c 2008-07-13
14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/src/buttons_shading.c 2008-07-13
16:57:24 UTC (rev 15554)
@@ -2864,15 +2864,15 @@
uiBlockSetCol(block, TH_BUT_SETTING1);
uiDefButS(block, MENU, B_LAMPREDRAW, "Falloff %t|Constant
%x0|Inverse Linear %x1|Inverse Square %x2|Custom Curve %x3|Lin/Quad Weighted
%x4|",
10,150,100,19, &la->falloff_type, 0,0,0,0, "Lamp
falloff - intensity decay with distance");
- uiDefButBitS(block, TOG, LA_SPHERE, REDRAWVIEW3D,"Sphere",
10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects
beyond the distance value");
+ uiDefButBitS(block, TOG, LA_SPHERE, B_LAMPPRV,"Sphere",
10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects
beyond the distance value");
}
uiBlockBeginAlign(block);
uiBlockSetCol(block, TH_BUT_SETTING1);
uiDefButBitS(block, TOG, LA_LAYER, 0,"Layer",
10,70,100,19,&la->mode, 0, 0, 0, 0, "Illuminates objects in the same layer as
the lamp only");
uiDefButBitS(block, TOG, LA_NEG, B_LAMPPRV,"Negative",
10,50,100,19,&la->mode, 0, 0, 0, 0, "Sets lamp to cast negative light");
- uiDefButBitS(block, TOG, LA_NO_DIFF, 0,"No Diffuse",
10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material
illuminated by this lamp");
- uiDefButBitS(block, TOG, LA_NO_SPEC, 0,"No Specular",
10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material
illuminated by this lamp");
+ uiDefButBitS(block, TOG, LA_NO_DIFF, B_LAMPPRV,"No Diffuse",
10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material
illuminated by this lamp");
+ uiDefButBitS(block, TOG, LA_NO_SPEC, B_LAMPPRV,"No Specular",
10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material
illuminated by this lamp");
uiBlockEndAlign(block);
uiBlockSetCol(block, TH_AUTO);
Modified: branches/blender-2.47/source/blender/src/editsound.c
===================================================================
--- branches/blender-2.47/source/blender/src/editsound.c 2008-07-13
14:49:07 UTC (rev 15553)
+++ branches/blender-2.47/source/blender/src/editsound.c 2008-07-13
16:57:24 UTC (rev 15554)
@@ -148,7 +148,7 @@
first= 0;
CFRA= cfra;
update_for_newframe();
- force_draw_plus(SPACE_VIEW3D, 1);
+ force_draw_all(0);
}
else PIL_sleep_ms(30);
Modified: branches/blender-2.47/source/blender/src/space.c
===================================================================
--- branches/blender-2.47/source/blender/src/space.c 2008-07-13 14:49:07 UTC
(rev 15553)
+++ branches/blender-2.47/source/blender/src/space.c 2008-07-13 16:57:24 UTC
(rev 15554)
@@ -4439,7 +4439,10 @@
switch(event) {
case UI_BUT_EVENT:
- if(val==REDRAWTIME) allqueue(REDRAWTIME, 0);
+ if(val==REDRAWTIME) {
+ allqueue(REDRAWTIME, 0);
+ addqueue(sa->win, REDRAW, 1);
+ }
else if(val==B_ADD_THEME) {
bTheme *btheme, *new;
@@ -4840,9 +4843,9 @@
if( cfra!=CFRA || first ) {
first= 0;
-
+
CFRA= cfra;
- force_draw(0);
+ force_draw_all(0);
update_for_newframe(); /* for
audio scrubbing */
}
else PIL_sleep_ms(30);
Modified: branches/blender-2.47/source/blender/src/vpaint.c
===================================================================
--- branches/blender-2.47/source/blender/src/vpaint.c 2008-07-13 14:49:07 UTC
(rev 15553)
+++ branches/blender-2.47/source/blender/src/vpaint.c 2008-07-13 16:57:24 UTC
(rev 15554)
@@ -566,9 +566,9 @@
cp= (char *)&col;
cp[0]= 255;
- cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
- cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
- cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+ cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+ cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+ cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
return col;
}
@@ -586,11 +586,11 @@
cp= (char *)&col;
cp[0]= 255;
- temp= cp1[1] + ((fac*cp2[1])>>8);
+ temp= cp1[1] + ((fac*cp2[1])/255);
if(temp>254) cp[1]= 255; else cp[1]= temp;
- temp= cp1[2] + ((fac*cp2[2])>>8);
+ temp= cp1[2] + ((fac*cp2[2])/255);
if(temp>254) cp[2]= 255; else cp[2]= temp;
- temp= cp1[3] + ((fac*cp2[3])>>8);
+ temp= cp1[3] + ((fac*cp2[3])/255);
if(temp>254) cp[3]= 255; else cp[3]= temp;
return col;
@@ -609,11 +609,11 @@
cp= (char *)&col;
cp[0]= 255;
- temp= cp1[1] - ((fac*cp2[1])>>8);
+ temp= cp1[1] - ((fac*cp2[1])/255);
if(temp<0) cp[1]= 0; else cp[1]= temp;
- temp= cp1[2] - ((fac*cp2[2])>>8);
+ temp= cp1[2] - ((fac*cp2[2])/255);
if(temp<0) cp[2]= 0; else cp[2]= temp;
- temp= cp1[3] - ((fac*cp2[3])>>8);
+ temp= cp1[3] - ((fac*cp2[3])/255);
if(temp<0) cp[3]= 0; else cp[3]= temp;
return col;
@@ -635,9 +635,9 @@
/* first mul, then blend the fac */
cp[0]= 255;
- cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])>>8) )>>8;
- cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])>>8) )>>8;
- cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])>>8) )>>8;
+ cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])/255) )/255;
+ cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])/255) )/255;
+ cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])/255) )/255;
return col;
@@ -664,9 +664,9 @@
return col1;
cp[0]= 255;
- cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
- cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
- cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+ cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+ cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+ cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
return col;
}
@@ -692,9 +692,9 @@
return col1;
cp[0]= 255;
- cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
- cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
- cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+ cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+ cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+ cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
return col;
}
Modified:
branches/blender-2.47/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Converter/KX_ConvertActuators.cpp
2008-07-13 14:49:07 UTC (rev 15553)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
