[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50170] trunk/blender/source/blender: correct assert for customdata overlap, also quiet `uninitialized` warning in transform.

[Campbell Barton]

Revision: 50170
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50170
Author:   campbellbarton
Date:     2012-08-24 08:17:53 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
correct assert for customdata overlap, also quiet `uninitialized` warning in 
transform.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/customdata.c
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-24 
05:14:16 UTC (rev 50169)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-24 
08:17:53 UTC (rev 50170)
@@ -2018,7 +2018,7 @@
 
                        for (j = 0; j < count; ++j) {
                                /* if this happens we need to do a temp copy, 
see: USE_INTERP_OVERLAP_FIX */
-                               BLI_assert(dest_index != src_indices[j]);
+                               BLI_assert(((source == dest) && (dest_index == 
src_indices[j])) == FALSE);
 
                                sources[j] = (char *)src_data + typeInfo->size 
* src_indices[j];
                        }

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c  2012-08-24 
05:14:16 UTC (rev 50169)
+++ trunk/blender/source/blender/editors/transform/transform.c  2012-08-24 
08:17:53 UTC (rev 50170)
@@ -208,6 +208,11 @@
                        /* TODO - NOT WORKING, this isnt so bad since its only 
display aspect */
                        ED_space_clip_get_aspect(t->sa->spacedata.first, &aspx, 
&aspy);
                }
+               else {
+                       /* should never happen, quiet warnings */
+                       BLI_assert(0);
+                       aspx = aspy = 1.0f;
+               }
 
                r_vec[0] *= aspx;
                r_vec[1] *= aspy;

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