[Bf-blender-cvs] [117bc1477e3] master: Cleanup: remove redundant property assignment
Campbell Barton
noreply at git.blender.org
Wed Feb 27 15:10:33 CET 2019
Commit: 117bc1477e3c280587b6a484cf739b93e51db612
Author: Campbell Barton
Date: Thu Feb 28 00:34:14 2019 +1100
Branches: master
https://developer.blender.org/rB117bc1477e3c280587b6a484cf739b93e51db612
Cleanup: remove redundant property assignment
Also cleanup comments
===================================================================
M source/blender/blenkernel/intern/ipo.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_gizmo_3d.c
===================================================================
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 356271d82bd..cccbb4aefe4 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -610,7 +610,7 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index)
return "shift_y";
}
- /* unrecognised adrcode, or not-yet-handled ones! */
+ /* unrecognized adrcode, or not-yet-handled ones! */
return NULL;
}
@@ -652,7 +652,7 @@ static const char *light_adrcodes_to_paths(int adrcode, int *array_index)
return mtex_adrcodes_to_paths(adrcode, array_index);
}
- /* unrecognised adrcode, or not-yet-handled ones! */
+ /* unrecognized adrcode, or not-yet-handled ones! */
return NULL;
}
@@ -677,7 +677,7 @@ static const char *sound_adrcodes_to_paths(int adrcode, int *array_index)
return "attenuation";
}
- /* unrecognised adrcode, or not-yet-handled ones! */
+ /* unrecognized adrcode, or not-yet-handled ones! */
return NULL;
}
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 0c9fe0fbaf9..878f9385c04 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -589,7 +589,7 @@ static void viewRedrawForce(const bContext *C, TransInfo *t)
else
WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
- /* for realtime animation record - send notifiers recognised by animation editors */
+ /* For real-time animation record - send notifiers recognized by animation editors */
// XXX: is this notifier a lame duck?
if ((t->animtimer) && IS_AUTOKEY_ON(t->scene))
WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, NULL);
@@ -2159,7 +2159,7 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
RNA_property_boolean_set(op->ptr, prop, (t->flag & T_NO_MIRROR) == 0);
}
- /* Orientastion used for redo. */
+ /* Orientation used for redo. */
short orientation;
if (t->con.mode & CON_APPLY) {
orientation = t->con.orientation;
@@ -2221,7 +2221,6 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
}
}
-
if ((prop = RNA_struct_find_property(op->ptr, "orient_type"))) {
/* constraint orientation can be global, even if user selects something else
* so use the orientation in the constraint if set */
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index d6121948b90..950390c24b3 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -769,14 +769,7 @@ enum {
/* transinfo->con->mode */
enum {
- /**
- * TODO(campbell): this has two meanings:
- * - Constraint axes.
- * - Transform values are evaluated in different orientation.
- *
- * We should split out this second meaning into another flag
- * because transform logic becomes hard to follow when we're
- * only want to support an alternate orientation. */
+ /** When set constraints are in use. */
CON_APPLY = 1 << 0,
/** These are only used for modal execution. */
CON_AXIS0 = 1 << 1,
@@ -859,7 +852,6 @@ struct wmKeyMap *transform_modal_keymap(struct wmKeyConfig *keyconf);
/*********************** transform_conversions.c ********** */
-struct ListBase;
void flushTransIntFrameActionData(TransInfo *t);
void flushTransGraphData(TransInfo *t);
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 7cf526f69fc..ff77653a72d 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -2205,7 +2205,6 @@ static void WIDGETGROUP_xform_shear_refresh(const bContext *C, wmGizmoGroup *gzg
RNA_float_set_array(&gzop->ptr, "orient_matrix", &tbounds.axis[0][0]);
RNA_enum_set(&gzop->ptr, "orient_type", orient_slot->type);
- RNA_enum_set(&gzop->ptr, "orient_matrix_type", orient_slot->type);
RNA_enum_set(&gzop->ptr, "orient_axis", i_ortho_b);
RNA_enum_set(&gzop->ptr, "orient_axis_ortho", i_ortho_a);
More information about the Bf-blender-cvs
mailing list