svn merge -r40051:40075 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 15:25:15 +0000 (15:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Sep 2011 15:25:15 +0000 (15:25 +0000)
1  2 
source/blender/editors/screen/screen_ops.c
source/blender/makesrna/RNA_access.h

index fcc8186d17eb4f77e6d39717ea53d72229e13086,62fdfc140dfe8500006aba88efbbaa2ee8f08738..48f7f049b23279d559aeaa38e14be6787ebd1412
@@@ -55,7 -55,6 +55,7 @@@
  #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_screen.h"
 +#include "BKE_tessmesh.h"
  #include "BKE_sound.h"
  
  #include "WM_api.h"
@@@ -315,7 -314,7 +315,7 @@@ int ED_operator_editmesh(bContext *C
  {
        Object *obedit= CTX_data_edit_object(C);
        if(obedit && obedit->type==OB_MESH)
 -              return NULL != ((Mesh *)obedit->data)->edit_mesh;
 +              return NULL != ((Mesh *)obedit->data)->edit_btmesh;
        return 0;
  }
  
@@@ -362,21 -361,24 +362,21 @@@ int ED_operator_uvedit(bContext *C
  {
        SpaceImage *sima= CTX_wm_space_image(C);
        Object *obedit= CTX_data_edit_object(C);
 +
        return ED_space_image_show_uvedit(sima, obedit);
  }
  
  int ED_operator_uvmap(bContext *C)
  {
        Object *obedit= CTX_data_edit_object(C);
 -      EditMesh *em= NULL;
 +      BMEditMesh *em= NULL;
        
        if(obedit && obedit->type==OB_MESH)
 -              em= BKE_mesh_get_editmesh((Mesh *)obedit->data);
 +              em= ((Mesh *)obedit->data)->edit_btmesh;
        
 -      if(em && (em->faces.first)) {
 -              BKE_mesh_end_editmesh(obedit->data, em);
 +      if(em && (em->bm->totface))
                return 1;
 -      }
        
 -      if(obedit)
 -              BKE_mesh_end_editmesh(obedit->data, em);
        return 0;
  }
  
@@@ -2951,7 -2953,7 +2951,7 @@@ int ED_screen_animation_play(bContext *
                        ScreenAnimData *sad= wt->customdata;
                        
                        sad->ar= CTX_wm_region(C);
 -              }
 +                      }
        }
  
        return OPERATOR_FINISHED;
@@@ -3483,8 -3485,8 +3483,8 @@@ void ED_keymap_screen(wmKeyConfig *keyc
        
        RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", UPARROWKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "end", 1);
        RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", DOWNARROWKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "end", 0);
-       RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", RIGHTARROWKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "end", 1);
-       RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "end", 0);
+       RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", RIGHTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", 1);
+       RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "end", 0);
        
        WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", UPARROWKEY, KM_PRESS, 0, 0);
        RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_keyframe_jump", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "next", 0);
index f2f2426e5312c86cd4e85983e6d97167895983e3,8af4fe7b76b198fd2691b7668eb68ad9c5d67c40..bfcf8f4461331477453ba703df611f1f0b7e22d7
@@@ -299,8 -299,6 +299,8 @@@ extern StructRNA RNA_MeshColorLayer
  extern StructRNA RNA_MeshDeformModifier;
  extern StructRNA RNA_MeshEdge;
  extern StructRNA RNA_MeshFace;
 +extern StructRNA RNA_MeshPolygon;
 +extern StructRNA RNA_MeshLoop;
  extern StructRNA RNA_MeshFloatProperty;
  extern StructRNA RNA_MeshFloatPropertyLayer;
  extern StructRNA RNA_MeshIntProperty;
@@@ -978,7 -976,11 +978,11 @@@ StructRNA *ID_code_to_RNA_type(short id
  
  
  /* macro which inserts the function name */
- #define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args)
+ #ifdef __GNUC__
+ #  define RNA_warning(format, args...) _RNA_warning("%s: " format "\n", __func__, ##args)
+ #else /* MSVC doesnt support variable length args in macros */
+ #  define RNA_warning _RNA_warning
+ #endif
  
  void _RNA_warning(const char *format, ...)
  #ifdef __GNUC__