Revision: 44773
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44773
Author: campbellbarton
Date: 2012-03-09 21:23:15 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
code cleanup: remove unused variable assignents and added bmesh submodule
links, doc correction reported by dfelinto.
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
Modified: trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst 2012-03-09
20:29:53 UTC (rev 44772)
+++ trunk/blender/doc/python_api/rst/info_tips_and_tricks.rst 2012-03-09
21:23:15 UTC (rev 44773)
@@ -82,7 +82,7 @@
import bpy
import os
- filename = os.path.join(os.path.basename(bpy.data.filepath), "myscript.py")
+ filename = os.path.join(os.path.dirname(bpy.data.filepath), "myscript.py")
exec(compile(open(filename).read(), filename, 'exec'))
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-09
20:29:53 UTC (rev 44772)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-09
21:23:15 UTC (rev 44773)
@@ -2303,17 +2303,14 @@
else if (mp->totloop == 3) {
- ml = mloop + mp->loopstart;
ML_TO_MF(0, 1, 2)
mface_index++;
}
else if (mp->totloop == 4) {
#ifdef USE_TESSFACE_QUADS
- ml = mloop + mp->loopstart;
ML_TO_MF_QUAD()
mface_index++;
#else
- ml = mloop + mp->loopstart;
ML_TO_MF(0, 1, 2)
mface_index++;
ML_TO_MF(0, 2, 3)
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2012-03-09 20:29:53 UTC (rev 44772)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2012-03-09 21:23:15 UTC (rev 44773)
@@ -2484,7 +2484,6 @@
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data,
CD_MTEXPOLY);
BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
if (!propmode && !uvedit_uv_selected(em, scene, l))
continue;
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-03-09
20:29:53 UTC (rev 44772)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2012-03-09
21:23:15 UTC (rev 44773)
@@ -1100,8 +1100,6 @@
select= 1;
BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
- tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data,
CD_MTEXPOLY);
-
a = 0;
BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
iterv1= uv_vertex_map_get(vmap, efa, a);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2012-03-09 20:29:53 UTC (rev 44772)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2012-03-09 21:23:15 UTC (rev 44773)
@@ -989,12 +989,13 @@
BMFace *efa= BM_active_face_get(em->bm, TRUE);
BMLoop *l;
BMIter iter, liter;
- MTexPoly *tf;
MLoopUV *luv;
float scale, aspx= 1.0f, aspy=1.0f;
- if(efa) {
- tf= CustomData_bmesh_get(&em->bm->pdata, efa->head.data,
CD_MTEXPOLY);
+ if (efa) {
+ MTexPoly *tf;
+
+ tf = CustomData_bmesh_get(&em->bm->pdata, efa->head.data,
CD_MTEXPOLY);
ED_image_uv_aspect(tf->tpage, &aspx, &aspy);
}
@@ -1005,7 +1006,6 @@
scale= aspy/aspx;
BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
- tf = CustomData_bmesh_get(&em->bm->pdata,
efa->head.data, CD_MTEXPOLY);
if (!BM_elem_flag_test(efa, BM_ELEM_SELECT) ||
BM_elem_flag_test(efa, BM_ELEM_HIDDEN))
continue;
@@ -1019,7 +1019,6 @@
scale= aspx/aspy;
BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
- tf = CustomData_bmesh_get(&em->bm->pdata,
efa->head.data, CD_MTEXPOLY);
if (!BM_elem_flag_test(efa,
BM_ELEM_SELECT)||BM_elem_flag_test(efa, BM_ELEM_HIDDEN))
continue;
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-09
20:29:53 UTC (rev 44772)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-09
21:23:15 UTC (rev 44773)
@@ -81,7 +81,13 @@
};
PyDoc_STRVAR(BPy_BM_doc,
-"This module provides access to blenders bmesh data structures."
+"This module provides access to blenders bmesh data structures.\n"
+"\n"
+"\n"
+"Submodules:\n"
+"\n"
+"* :mod:`bmesh.utils`\n"
+"* :mod:`bmesh.types`\n"
);
static struct PyModuleDef BPy_BM_module_def = {
PyModuleDef_HEAD_INIT,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
