archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

copy over a change from bmesh branch that was needed for lightmap unpack to work, also tag some rna vars as unused.

Browse Source
This commit is contained in:
Campbell Barton
2012-02-20 22:58:00 +00:00
parent 6d3cdbe0e5
commit 71146bf93b
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/modules/bpy_extras/mesh_utils.py
View File

@@ -140,8 +140,7 @@ def edge_loops_from_faces(mesh, faces=None, seams=()):
edges = {} edges = {}
for f in faces: for f in faces:
# if len(f) == 4: if len(f.vertices) == 4:
if f.vertices_raw[3] != 0:
edge_keys = f.edge_keys edge_keys = f.edge_keys
for i, edkey in enumerate(f.edge_keys): for i, edkey in enumerate(f.edge_keys):
edges.setdefault(edkey, []).append(edge_keys[OTHER_INDEX[i]]) edges.setdefault(edkey, []).append(edge_keys[OTHER_INDEX[i]])

2
source/blender/makesrna/intern/makesrna.c
View File

@@ -2967,5 +2967,3 @@ int main(int argc, char **argv)
return return_status; return return_status;
} }

2
source/blender/makesrna/intern/rna_space.c
View File

@@ -323,7 +323,7 @@ static void rna_SpaceView3D_layer_update(Main *bmain, Scene *UNUSED(scene), Poin
DAG_on_visible_update(bmain, FALSE); 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); View3D *v3d= (View3D*)(ptr->data);
ScrArea *sa= rna_area_from_space(ptr); ScrArea *sa= rna_area_from_space(ptr);

8
source/blender/makesrna/intern/rna_tracking.c
View File

@@ -59,7 +59,7 @@ static char *rna_tracking_path(PointerRNA *UNUSED(ptr))
return BLI_sprintfN("tracking"); 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; MovieClip *clip= (MovieClip*)ptr->id.data;
MovieTracking *tracking= &clip->tracking; MovieTracking *tracking= &clip->tracking;
@@ -73,7 +73,7 @@ static void rna_tracking_defaultSettings_levelsUpdate(Main *UNUSED(bmain), Scene
} }
} }
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; MovieClip *clip= (MovieClip*)ptr->id.data;
MovieTracking *tracking= &clip->tracking; MovieTracking *tracking= &clip->tracking;
@@ -83,7 +83,7 @@ static void rna_tracking_defaultSettings_patternUpdate(Main *UNUSED(bmain), Scen
settings->default_search_size= settings->default_pattern_size; 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; MovieClip *clip= (MovieClip*)ptr->id.data;
MovieTracking *tracking= &clip->tracking; MovieTracking *tracking= &clip->tracking;
@@ -366,7 +366,7 @@ void rna_trackingObject_name_set(PointerRNA *ptr, const char *value)
BKE_tracking_object_unique_name(&clip->tracking, object); 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; MovieClip *clip= (MovieClip*)ptr->id.data;