[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38006] trunk/blender/source/blender: fix [#27820] foreach_get on bpy_prop_collections returns weird results

[Campbell Barton]

Revision: 38006
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38006
Author:   campbellbarton
Date:     2011-07-01 08:48:00 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
fix [#27820] foreach_get on bpy_prop_collections returns weird results

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_hook.c
    trunk/blender/source/blender/makesrna/intern/rna_access.c

Modified: trunk/blender/source/blender/editors/object/object_hook.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_hook.c   2011-07-01 
08:27:52 UTC (rev 38005)
+++ trunk/blender/source/blender/editors/object/object_hook.c   2011-07-01 
08:48:00 UTC (rev 38006)
@@ -107,7 +107,7 @@
 
        if(obedit->actdef) {
                const int defgrp_index= obedit->actdef-1;
-               int i, totvert=0;
+               int totvert=0;
 
                MDeformVert *dvert;
                EditVert *eve;

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c   2011-07-01 
08:27:52 UTC (rev 38005)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c   2011-07-01 
08:48:00 UTC (rev 38006)
@@ -2839,7 +2839,7 @@
                                }
 
                                /* editable check */
-                               if(RNA_property_editable(&itemptr, iprop)) {
+                               if(!set || RNA_property_editable(&itemptr, 
iprop)) {
                                        if(a+itemlen > in.len) {
                                                BKE_reportf(reports, RPT_ERROR, 
"Array length mismatch (got %d, expected more).", in.len);
                                                err= 1;

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