[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44286] trunk/blender: copy over a change from bmesh branch that was needed for lightmap unpack to work , also tag some rna vars as unused.

[Campbell Barton]

Revision: 44286
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44286
Author:   campbellbarton
Date:     2012-02-20 22:58:00 +0000 (Mon, 20 Feb 2012)
Log Message:
-----------
copy over a change from bmesh branch that was needed for lightmap unpack to 
work, also tag some rna vars as unused.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_tracking.c

Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py      
2012-02-20 22:16:20 UTC (rev 44285)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py      
2012-02-20 22:58:00 UTC (rev 44286)
@@ -140,8 +140,7 @@
     edges = {}
 
     for f in faces:
-#        if len(f) == 4:
-        if f.vertices_raw[3] != 0:
+        if len(f.vertices) == 4:
             edge_keys = f.edge_keys
             for i, edkey in enumerate(f.edge_keys):
                 edges.setdefault(edkey, []).append(edge_keys[OTHER_INDEX[i]])

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c     2012-02-20 
22:16:20 UTC (rev 44285)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c     2012-02-20 
22:58:00 UTC (rev 44286)
@@ -2967,5 +2967,3 @@
 
        return return_status;
 }
-
-

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c    2012-02-20 
22:16:20 UTC (rev 44285)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c    2012-02-20 
22:58:00 UTC (rev 44286)
@@ -323,7 +323,7 @@
        DAG_on_visible_update(bmain, FALSE);
 }
 
-static void rna_SpaceView3D_viewport_shade_update(Main *bmain, Scene *scene, 
PointerRNA *ptr)
+static void rna_SpaceView3D_viewport_shade_update(Main *UNUSED(bmain), Scene 
*UNUSED(scene), PointerRNA *ptr)
 {
        View3D *v3d= (View3D*)(ptr->data);
        ScrArea *sa= rna_area_from_space(ptr);

Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-02-20 
22:16:20 UTC (rev 44285)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-02-20 
22:58:00 UTC (rev 44286)
@@ -59,7 +59,7 @@
        return BLI_sprintfN("tracking");
 }
 
-static void rna_tracking_defaultSettings_levelsUpdate(Main *UNUSED(bmain), 
Scene *scene, PointerRNA *ptr)
+static void rna_tracking_defaultSettings_levelsUpdate(Main *UNUSED(bmain), 
Scene *UNUSED(scene), PointerRNA *ptr)
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
        MovieTracking *tracking= &clip->tracking;
@@ -73,7 +73,7 @@
        }
 }
 
-static void rna_tracking_defaultSettings_patternUpdate(Main *UNUSED(bmain), 
Scene *scene, PointerRNA *ptr)
+static void rna_tracking_defaultSettings_patternUpdate(Main *UNUSED(bmain), 
Scene *UNUSED(scene), PointerRNA *ptr)
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
        MovieTracking *tracking= &clip->tracking;
@@ -83,7 +83,7 @@
                settings->default_search_size= settings->default_pattern_size;
 }
 
-static void rna_tracking_defaultSettings_searchUpdate(Main *UNUSED(bmain), 
Scene *scene, PointerRNA *ptr)
+static void rna_tracking_defaultSettings_searchUpdate(Main *UNUSED(bmain), 
Scene *UNUSED(scene), PointerRNA *ptr)
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
        MovieTracking *tracking= &clip->tracking;
@@ -366,7 +366,7 @@
        BKE_tracking_object_unique_name(&clip->tracking, object);
 }
 
-static void rna_trackingObject_flushUpdate(Main *UNUSED(bmain), Scene *scene, 
PointerRNA *ptr)
+static void rna_trackingObject_flushUpdate(Main *UNUSED(bmain), Scene 
*UNUSED(scene), PointerRNA *ptr)
 {
        MovieClip *clip= (MovieClip*)ptr->id.data;
 

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