[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12686] trunk/blender/source/blender:
Brecht Van Lommel
brechtvanlommel at pandora.be
Tue Nov 27 10:59:18 CET 2007
Revision: 12686
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12686
Author: blendix
Date: 2007-11-27 10:59:18 +0100 (Tue, 27 Nov 2007)
Log Message:
-----------
Particles
=========
- Fix for bug #7832: boids physics crashed.
- Bugfix for child particles not getting orco texture coords.
- Allow smaller strand sizes in blender units.
- Fix for a common but harmless uninitialized value warning in
valgrind, in the event queue.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/src/buttons_shading.c
trunk/blender/source/blender/src/editscreen.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2007-11-27 02:13:56 UTC (rev 12685)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2007-11-27 09:59:18 UTC (rev 12686)
@@ -3832,7 +3832,7 @@
if(part->phystype==PART_PHYS_BOIDS){
/* create particle tree for fast inter-particle comparisons */
- KDTree *tree=BLI_kdtree_new(totpart);
+ tree=BLI_kdtree_new(totpart);
for(p=0, pa=psys->particles; p<totpart; p++,pa++){
if(pa->flag & (PARS_NO_DISP+PARS_UNEXIST) || pa->alive!=PARS_ALIVE)
continue;
Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c 2007-11-27 02:13:56 UTC (rev 12685)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c 2007-11-27 09:59:18 UTC (rev 12686)
@@ -1950,6 +1950,11 @@
r_tilt=2.0f*cpa->rand[2];
+ /* get orco */
+ psys_particle_on_emitter(ob, psmd,
+ (part->childtype == PART_CHILD_FACES)? PART_FROM_FACE: PART_FROM_PARTICLE,
+ cpa->num,DMCACHE_ISCHILD,cpa->fuv,cpa->foffset,orco,0,0,0);
+
if(uvco){
layer=psmd->dm->faceData.layers + CustomData_get_layer_index(&psmd->dm->faceData,CD_MFACE);
Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c 2007-11-27 02:13:56 UTC (rev 12685)
+++ trunk/blender/source/blender/src/buttons_shading.c 2007-11-27 09:59:18 UTC (rev 12686)
@@ -3859,8 +3859,8 @@
uiDefButBitI(block, TOG, MA_TANGENT_STR, 0, "Use Tangent Shading", 10,90,115,20, &(ma->mode), 0, 0, 0, 0, "Uses direction of strands as normal for tangent-shading");
uiDefButBitI(block, TOG, MA_STR_B_UNITS, 0, "Use Blender Units", 125,90,115,20, &(ma->mode), 0, 0, 0, 0, "Use actual Blender units for widths instead of pixels");
if(ma->mode & MA_STR_B_UNITS){
- uiDefButF(block, NUMSLI, 0, "Start ", 10, 70, 230,20, &ma->strand_sta, 0.01, 20.0, 2, 0, "Start size of strands in Blender units");
- uiDefButF(block, NUMSLI, 0, "End ", 10, 50, 230,20, &ma->strand_end, 0.01, 10.0, 2, 0, "End size of strands in Blender units");
+ uiDefButF(block, NUMSLI, 0, "Start ", 10, 70, 230,20, &ma->strand_sta, 0.0001, 2.0, 2, 0, "Start size of strands in Blender units");
+ uiDefButF(block, NUMSLI, 0, "End ", 10, 50, 230,20, &ma->strand_end, 0.0001, 1.0, 2, 0, "End size of strands in Blender units");
}
else{
uiDefButF(block, NUMSLI, 0, "Start ", 10, 70, 230,20, &ma->strand_sta, 0.25, 20.0, 2, 0, "Start size of strands in pixels");
Modified: trunk/blender/source/blender/src/editscreen.c
===================================================================
--- trunk/blender/source/blender/src/editscreen.c 2007-11-27 02:13:56 UTC (rev 12685)
+++ trunk/blender/source/blender/src/editscreen.c 2007-11-27 09:59:18 UTC (rev 12686)
@@ -491,6 +491,8 @@
}
else {
BWinEvent evt;
+
+ memset(&evt, 0, sizeof(evt));
evt.event= event;
evt.val= val;
evt.ascii= ascii;
More information about the Bf-blender-cvs
mailing list