Revision: 56054
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56054
Author: campbellbarton
Date: 2013-04-15 04:34:14 +0000 (Mon, 15 Apr 2013)
Log Message:
-----------
code cleanup: minor BMESH_TODO's, some were left in even though they were
done/invalid.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/mesh/editmesh_select.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/python/bmesh/bmesh_py_utils.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-04-14
23:43:00 UTC (rev 56053)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-04-15
04:34:14 UTC (rev 56054)
@@ -26,13 +26,6 @@
* This file contains code for dealing
* with polygons (normal/area calculation,
* tessellation, etc)
- *
- * BMESH_TODO:
- * - Add in Tessellator frontend that creates
- * BMTriangles from copied faces
- *
- * - Add in Function that checks for and flags
- * degenerate faces.
*/
#include "DNA_listBase.h"
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2013-04-14
23:43:00 UTC (rev 56053)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2013-04-15
04:34:14 UTC (rev 56054)
@@ -6544,13 +6544,13 @@
Object *obedit = CTX_data_edit_object(C);
ListBase *editnurb;
Nurb *nu;
- int newob = 0;
- int enter_editmode, is_aligned;
+ bool newob = false;
+ bool enter_editmode, is_view_aligned;
unsigned int layer;
float loc[3], rot[3];
float mat[4][4];
- if (!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, &is_aligned))
+ if (!ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, &is_view_aligned))
return OPERATOR_CANCELLED;
if (!isSurf) { /* adding curve */
@@ -6558,7 +6558,7 @@
Curve *cu;
obedit = ED_object_add_type(C, OB_CURVE, loc, rot,
TRUE, layer);
- newob = 1;
+ newob = true;
cu = (Curve *)obedit->data;
cu->flag |= CU_DEFORM_FILL;
@@ -6573,7 +6573,7 @@
else { /* adding surface */
if (obedit == NULL || obedit->type != OB_SURF) {
obedit = ED_object_add_type(C, OB_SURF, loc, rot, TRUE,
layer);
- newob = 1;
+ newob = true;
}
else {
DAG_id_tag_update(&obedit->id, OB_RECALC_DATA);
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2013-04-14
23:43:00 UTC (rev 56053)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2013-04-15
04:34:14 UTC (rev 56054)
@@ -141,7 +141,7 @@
void ED_object_add_generic_props(struct wmOperatorType *ot, int do_editmode);
int ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op,
float loc[3], float rot[3],
- int *enter_editmode, unsigned int *layer,
int *is_view_aligned);
+ bool *enter_editmode, unsigned int *layer,
bool *is_view_aligned);
struct Object *ED_object_add_type(struct bContext *C, int type, const float
loc[3], const float rot[3],
int enter_editmode, unsigned int layer);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2013-04-14
23:43:00 UTC (rev 56053)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2013-04-15
04:34:14 UTC (rev 56054)
@@ -57,11 +57,11 @@
* or at least something more descriptive */
static Object *make_prim_init(bContext *C, const char *idname,
float *dia, float mat[4][4],
- int *state, const float loc[3], const float
rot[3], const unsigned int layer)
+ bool *was_editmode, const float loc[3], const
float rot[3], const unsigned int layer)
{
Object *obedit = CTX_data_edit_object(C);
- *state = 0;
+ *was_editmode = false;
if (obedit == NULL || obedit->type != OB_MESH) {
obedit = ED_object_add_type(C, OB_MESH, loc, rot, false, layer);
@@ -70,7 +70,7 @@
/* create editmode */
ED_object_editmode_enter(C, EM_DO_UNDO | EM_IGNORE_LAYER); /*
rare cases the active layer is messed up */
- *state = 1;
+ *was_editmode = true;
}
*dia = ED_object_new_primitive_matrix(C, obedit, loc, rot, mat, false);
@@ -78,10 +78,10 @@
return obedit;
}
-static void make_prim_finish(bContext *C, Object *obedit, int *state, int
enter_editmode)
+static void make_prim_finish(bContext *C, Object *obedit, bool was_editmode,
int enter_editmode)
{
BMEditMesh *em = BMEdit_FromObject(obedit);
- const int exit_editmode = (*state && !enter_editmode);
+ const int exit_editmode = ((was_editmode == true) && (enter_editmode ==
false));
/* Primitive has all verts selected, use vert select flush
* to push this up to edges & faces. */
@@ -102,12 +102,12 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state;
+ bool enter_editmode;
+ bool was_editmode;
unsigned int layer;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"),
&dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Plane"),
&dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "verts.out",
@@ -116,7 +116,7 @@
return OPERATOR_CANCELLED;
}
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -143,12 +143,12 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state;
+ bool enter_editmode;
+ bool was_editmode;
unsigned int layer;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"),
&dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cube"),
&dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "verts.out", "create_cube
matrix=%m4 size=%f", mat, dia * 2.0f)) {
@@ -156,7 +156,7 @@
}
/* BMESH_TODO make plane side this: M_SQRT2 - plane (diameter of 1.41
makes it unit size) */
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -189,15 +189,16 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state, cap_end, cap_tri;
+ bool enter_editmode;
+ int cap_end, cap_tri;
unsigned int layer;
+ bool was_editmode;
cap_end = RNA_enum_get(op->ptr, "fill_type");
cap_tri = (cap_end == 2);
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH,
"Circle"), &dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH,
"Circle"), &dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "verts.out",
@@ -208,7 +209,7 @@
return OPERATOR_CANCELLED;
}
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -244,15 +245,16 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state, cap_end, cap_tri;
+ bool enter_editmode;
+ int cap_end, cap_tri;
unsigned int layer;
+ bool was_editmode;
cap_end = RNA_enum_get(op->ptr, "end_fill_type");
cap_tri = (cap_end == 2);
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH,
"Cylinder"), &dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH,
"Cylinder"), &dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(
@@ -267,7 +269,7 @@
return OPERATOR_CANCELLED;
}
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -305,15 +307,16 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state, cap_end, cap_tri;
+ bool enter_editmode;
+ int cap_end, cap_tri;
unsigned int layer;
+ bool was_editmode;
cap_end = RNA_enum_get(op->ptr, "end_fill_type");
cap_tri = (cap_end == 2);
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"),
&dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Cone"),
&dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(
@@ -325,7 +328,7 @@
return OPERATOR_CANCELLED;
}
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -365,12 +368,12 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state;
+ bool enter_editmode;
+ bool was_editmode;
unsigned int layer;
ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, NULL);
- obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"),
&dia, mat, &state, loc, rot, layer);
+ obedit = make_prim_init(C, CTX_DATA_(BLF_I18NCONTEXT_ID_MESH, "Grid"),
&dia, mat, &was_editmode, loc, rot, layer);
em = BMEdit_FromObject(obedit);
if (!EDBM_op_call_and_selectf(em, op, "verts.out",
@@ -382,7 +385,7 @@
return OPERATOR_CANCELLED;
}
- make_prim_finish(C, obedit, &state, enter_editmode);
+ make_prim_finish(C, obedit, was_editmode, enter_editmode);
return OPERATOR_FINISHED;
}
@@ -418,15 +421,16 @@
Object *obedit;
BMEditMesh *em;
float loc[3], rot[3], mat[4][4], dia;
- int enter_editmode;
- int state, view_aligned;
+ bool enter_editmode;
+ bool is_view_aligned;
unsigned int layer;
+ bool was_editmode;
- ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, &view_aligned);
- if (!view_aligned)
+ ED_object_add_generic_get_opts(C, op, loc, rot, &enter_editmode,
&layer, &is_view_aligned);
+ if (!is_view_aligned)
rot[0] += (float)M_PI / 2.0f;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
