[Bf-blender-cvs] [3223809] gooseberry: Merge branch 'master' into gooseberry
Antony Riakiotakis
noreply at git.blender.org
Tue May 26 14:56:48 CEST 2015
Commit: 322380999ed91179ebce511c7b14e470b48bf993
Author: Antony Riakiotakis
Date: Tue May 26 14:56:36 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB322380999ed91179ebce511c7b14e470b48bf993
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_ops.c
===================================================================
===================================================================
diff --cc source/blender/editors/object/object_intern.h
index 115676a,27549ea..2049f03
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@@ -244,17 -244,8 +244,17 @@@ void OBJECT_OT_vertex_weight_set_active
void OBJECT_OT_vertex_weight_normalize_active_vertex(struct wmOperatorType *ot);
void OBJECT_OT_vertex_weight_copy(struct wmOperatorType *ot);
+/* object_fmap.c */
+void OBJECT_OT_face_map_add(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_remove(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_assign(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_remove_from(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_select(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_deselect(struct wmOperatorType *ot);
+void OBJECT_OT_face_map_move(struct wmOperatorType *ot);
+
/* object_warp.c */
- void OBJECT_OT_vertex_warp(struct wmOperatorType *ot);
+ void TRANSFORM_OT_vertex_warp(struct wmOperatorType *ot);
/* object_shapekey.c */
void OBJECT_OT_shape_key_add(struct wmOperatorType *ot);
diff --cc source/blender/editors/object/object_ops.c
index 9865a59,b2562b7..c0eefd6
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -200,15 -200,7 +200,15 @@@ void ED_operatortypes_object(void
WM_operatortype_append(OBJECT_OT_vertex_weight_normalize_active_vertex);
WM_operatortype_append(OBJECT_OT_vertex_weight_copy);
+ WM_operatortype_append(OBJECT_OT_face_map_add);
+ WM_operatortype_append(OBJECT_OT_face_map_remove);
+ WM_operatortype_append(OBJECT_OT_face_map_assign);
+ WM_operatortype_append(OBJECT_OT_face_map_remove_from);
+ WM_operatortype_append(OBJECT_OT_face_map_select);
+ WM_operatortype_append(OBJECT_OT_face_map_deselect);
+ WM_operatortype_append(OBJECT_OT_face_map_move);
+
- WM_operatortype_append(OBJECT_OT_vertex_warp);
+ WM_operatortype_append(TRANSFORM_OT_vertex_warp);
WM_operatortype_append(OBJECT_OT_game_property_new);
WM_operatortype_append(OBJECT_OT_game_property_remove);
diff --cc source/blender/editors/transform/transform.c
index 32295bb,43cee8b..b629a69
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@@ -2022,37 -2024,20 +2024,49 @@@ void saveTransform(bContext *C, TransIn
RNA_property_boolean_set_array(op->ptr, prop, constraint_axis);
}
+
+ {
+ const char *prop_id = NULL;
+ if (t->mode == TFM_SHRINKFATTEN) {
+ prop_id = "use_even_offset";
+ }
+
+ if (prop_id && (prop = RNA_struct_find_property(op->ptr, prop_id))) {
+
+ RNA_property_boolean_set(op->ptr, prop, (t->flag & T_ALT_TRANSFORM) != 0);
+ }
+ }
}
+static void initSnappingAspect(TransInfo *t)
+{
+ if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
+ if (t->options & CTX_MASK) {
+ ED_space_image_get_aspect(t->sa->spacedata.first, t->snap_aspect, t->snap_aspect + 1);
+ }
+ else if (t->options & CTX_PAINT_CURVE) {
+ t->snap_aspect[0] = t->snap_aspect[1] = 1.0;
+ }
+ else {
+ ED_space_image_get_uv_aspect(t->sa->spacedata.first, t->snap_aspect, t->snap_aspect + 1);
+ }
+ }
+ else if ((t->spacetype == SPACE_IPO) && (t->mode == TFM_TRANSLATION)) {
+ View2D *v2d = &t->ar->v2d;
+ View2DGrid *grid;
+ SpaceIpo *sipo = t->sa->spacedata.first;
+ int unity = V2D_UNIT_VALUES;
+ int unitx = (sipo->flag & SIPO_DRAWTIME) ? V2D_UNIT_SECONDS : V2D_UNIT_FRAMESCALE;
+
+ /* grid */
+ grid = UI_view2d_grid_calc(t->scene, v2d, unitx, V2D_GRID_NOCLAMP, unity, V2D_GRID_NOCLAMP, t->ar->winx, t->ar->winy);
+
+ UI_view2d_grid_size(grid, t->snap_aspect, t->snap_aspect + 1);
+ UI_view2d_grid_free(grid);
+ }
+}
+
+
/* note: caller needs to free 't' on a 0 return */
bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *event, int mode)
{
diff --cc source/blender/editors/transform/transform_ops.c
index 8b235c7,782b975..f77f1d3
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@@ -64,25 -64,24 +64,25 @@@ typedef struct TransformModeItem
static const float VecOne[3] = {1, 1, 1};
- static char OP_TRANSLATION[] = "TRANSFORM_OT_translate";
- static char OP_ROTATION[] = "TRANSFORM_OT_rotate";
- static char OP_TOSPHERE[] = "TRANSFORM_OT_tosphere";
- static char OP_RESIZE[] = "TRANSFORM_OT_resize";
- static char OP_SKIN_RESIZE[] = "TRANSFORM_OT_skin_resize";
- static char OP_SHEAR[] = "TRANSFORM_OT_shear";
- static char OP_BEND[] = "TRANSFORM_OT_bend";
- static char OP_SHRINK_FATTEN[] = "TRANSFORM_OT_shrink_fatten";
- static char OP_PUSH_PULL[] = "TRANSFORM_OT_push_pull";
- static char OP_TILT[] = "TRANSFORM_OT_tilt";
- static char OP_TRACKBALL[] = "TRANSFORM_OT_trackball";
- static char OP_MIRROR[] = "TRANSFORM_OT_mirror";
- static char OP_EDGE_SLIDE[] = "TRANSFORM_OT_edge_slide";
- static char OP_VERT_SLIDE[] = "TRANSFORM_OT_vert_slide";
- static char OP_EDGE_CREASE[] = "TRANSFORM_OT_edge_crease";
- static char OP_EDGE_BWEIGHT[] = "TRANSFORM_OT_edge_bevelweight";
- static char OP_SEQ_SLIDE[] = "TRANSFORM_OT_seq_slide";
+ static const char OP_TRANSLATION[] = "TRANSFORM_OT_translate";
+ static const char OP_ROTATION[] = "TRANSFORM_OT_rotate";
+ static const char OP_TOSPHERE[] = "TRANSFORM_OT_tosphere";
+ static const char OP_RESIZE[] = "TRANSFORM_OT_resize";
+ static const char OP_SKIN_RESIZE[] = "TRANSFORM_OT_skin_resize";
+ static const char OP_SHEAR[] = "TRANSFORM_OT_shear";
+ static const char OP_BEND[] = "TRANSFORM_OT_bend";
+ static const char OP_SHRINK_FATTEN[] = "TRANSFORM_OT_shrink_fatten";
+ static const char OP_PUSH_PULL[] = "TRANSFORM_OT_push_pull";
+ static const char OP_TILT[] = "TRANSFORM_OT_tilt";
+ static const char OP_TRACKBALL[] = "TRANSFORM_OT_trackball";
+ static const char OP_MIRROR[] = "TRANSFORM_OT_mirror";
+ static const char OP_EDGE_SLIDE[] = "TRANSFORM_OT_edge_slide";
+ static const char OP_VERT_SLIDE[] = "TRANSFORM_OT_vert_slide";
+ static const char OP_EDGE_CREASE[] = "TRANSFORM_OT_edge_crease";
+ static const char OP_EDGE_BWEIGHT[] = "TRANSFORM_OT_edge_bevelweight";
+ static const char OP_SEQ_SLIDE[] = "TRANSFORM_OT_seq_slide";
+
static void TRANSFORM_OT_translate(struct wmOperatorType *ot);
static void TRANSFORM_OT_rotate(struct wmOperatorType *ot);
static void TRANSFORM_OT_tosphere(struct wmOperatorType *ot);
More information about the Bf-blender-cvs
mailing list