[Bf-blender-cvs] [2719a3d] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 2719a3d593abd32f97b78b778d16acb5739058a2
Author: Julian Eisel
Date:   Thu May 28 22:14:21 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB2719a3d593abd32f97b78b778d16acb5739058a2

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/object/object_ops.c

===================================================================



===================================================================

diff --cc source/blender/editors/object/object_intern.h
index cd2d6eb,27549ea..c1a7c47
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@@ -246,17 -244,8 +246,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);
@@@ -282,11 -271,8 +282,11 @@@ void OBJECT_OT_lod_add(struct wmOperato
  void OBJECT_OT_lod_remove(struct wmOperatorType *ot);
  
  /* object_random.c */
- void OBJECT_OT_vertex_random(struct wmOperatorType *ot);
+ void TRANSFORM_OT_vertex_random(struct wmOperatorType *ot);
  
 +/* object_lamp.c */
 +void LAMP_OT_lamp_position(struct wmOperatorType *ot);
 +
  /* object_transfer_data.c */
  void OBJECT_OT_data_transfer(struct wmOperatorType *ot);
  void OBJECT_OT_datalayout_transfer(struct wmOperatorType *ot);
diff --cc source/blender/editors/object/object_ops.c
index 426efdf,b2562b7..a9ebd5f
--- 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);
@@@ -257,14 -249,10 +257,14 @@@
  	WM_operatortype_append(OBJECT_OT_lod_add);
  	WM_operatortype_append(OBJECT_OT_lod_remove);
  
- 	WM_operatortype_append(OBJECT_OT_vertex_random);
+ 	WM_operatortype_append(TRANSFORM_OT_vertex_random);
  
 +	WM_operatortype_append(LAMP_OT_lamp_position);
 +
  	WM_operatortype_append(OBJECT_OT_data_transfer);
  	WM_operatortype_append(OBJECT_OT_datalayout_transfer);
 +
 +	WM_operatortype_append(OBJECT_OT_widget_add);
  }
  
  void ED_operatormacros_object(void)
diff --cc source/blender/editors/transform/transform_ops.c
index 40d2127,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);