[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14514] trunk/blender/source/blender/ render/intern/source/convertblender.c:

[Brecht Van Lommel]

Revision: 14514
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14514
Author:   blendix
Date:     2008-04-22 12:34:41 +0200 (Tue, 22 Apr 2008)

Log Message:
-----------

Fix for bug #9489: particle uv coordinates were not correct
for children from particles on subsurf.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c  
2008-04-22 10:08:00 UTC (rev 14513)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c  
2008-04-22 10:34:41 UTC (rev 14514)
@@ -1884,14 +1884,24 @@
                                        }
                                }
                                else 
if(ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
-                                       for(i=0; i<totuv; i++){
-                                               ParticleData *parent = 
psys->particles+cpa->parent;
-                                               MFace 
*mface=psmd->dm->getFaceData(psmd->dm,parent->num,CD_MFACE);
+                                       ParticleData *parent = psys->particles 
+ cpa->parent;
+                                       num= parent->num_dmcache;
 
-                                               
mtface=(MTFace*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MTFACE,i);
-                                               mtface+=parent->num;
-                                               
-                                               
psys_interpolate_uvs(mtface,mface->v4,parent->fuv,uvco+2*i);
+                                       if(num == DMCACHE_NOTFOUND)
+                                               if(parent->num < 
psmd->dm->getNumFaces(psmd->dm))
+                                                       num= parent->num;
+
+                                       for(i=0; i<totuv; i++) {
+                                               if(num != DMCACHE_NOTFOUND) {
+                                                       MFace 
*mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
+                                                       
mtface=(MTFace*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MTFACE,i);
+                                                       mtface+=num;
+                                                       
psys_interpolate_uvs(mtface,mface->v4,parent->fuv,uvco+2*i);
+                                               }
+                                               else {
+                                                       uvco[2*i]= 0.0f;
+                                                       uvco[2*i + 1]= 0.0f;
+                                               }
                                        }
                                }
                        }
@@ -1911,13 +1921,23 @@
                                        }
                                }
                                else 
if(ELEM(part->from,PART_FROM_FACE,PART_FROM_VOLUME)){
+                                       ParticleData *parent = psys->particles 
+ cpa->parent;
+                                       num= parent->num_dmcache;
+
+                                       if(num == DMCACHE_NOTFOUND)
+                                               if(parent->num < 
psmd->dm->getNumFaces(psmd->dm))
+                                                       num= parent->num;
+
                                        for(i=0; i<totcol; i++){
-                                               ParticleData *parent = 
psys->particles+cpa->parent;
-                                               MFace 
*mface=psmd->dm->getFaceData(psmd->dm,parent->num,CD_MFACE);
-                                               MCol 
*mc=(MCol*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MCOL,i);
-                                               mc+=parent->num*4;
-                                               
-                                               
psys_interpolate_mcol(mc,mface->v4,parent->fuv,mcol+i);
+                                               if(num != DMCACHE_NOTFOUND) {
+                                                       MFace 
*mface=psmd->dm->getFaceData(psmd->dm,num,CD_MFACE);
+                                                       MCol 
*mc=(MCol*)CustomData_get_layer_n(&psmd->dm->faceData,CD_MCOL,i);
+                                                       mc+=num*4;
+                                                       
+                                                       
psys_interpolate_mcol(mc,mface->v4,parent->fuv,mcol+i);
+                                               }
+                                               else
+                                                       memset(&mcol[i], 0, 
sizeof(MCol));
                                        }
                                }
                        }


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs