- clear some warnings

- rename layout.operator_enums -> operator_enum (since we have operator_menu_enum, only called in 4 places)

diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 433c12b0620c8a84764b2f844b3e2dd1bd9a1e8b..9687bcfaadf73453b2ff55d7b9694d1aa7707c69 100644 (file)
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -204,7 +204,7 @@ class IMAGE_MT_uvs_weldalign(bpy.types.Menu):
         layout = self.layout
 
         layout.operator("uv.weld")  # W, 1
-        layout.operator_enums("uv.align", "axis")  # W, 2/3/4
+        layout.operator_enum("uv.align", "axis")  # W, 2/3/4
 
 
 class IMAGE_MT_uvs(bpy.types.Menu):

diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 5b23fd6d5c21bb28fe1fed9e013f696b7aefc88a..f7f177e07e3614f06bc47bd61bda03c86cf3d7dc 100644 (file)
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -317,11 +317,11 @@ class VIEW3D_MT_view_navigation(bpy.types.Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator_enums("view3d.view_orbit", "type")
+        layout.operator_enum("view3d.view_orbit", "type")
 
         layout.separator()
 
-        layout.operator_enums("view3d.view_pan", "type")
+        layout.operator_enum("view3d.view_pan", "type")
 
         layout.separator()
 
@@ -933,7 +933,7 @@ class VIEW3D_MT_make_links(bpy.types.Menu):
             layout.operator_menu_enum("object.make_links_scene", "scene", text="Objects to Scene...")
             layout.operator_menu_enum("marker.make_links_scene", "scene", text="Markers to Scene...")
 
-        layout.operator_enums("object.make_links_data", "type")  # inline
+        layout.operator_enum("object.make_links_data", "type")  # inline
 
 
 class VIEW3D_MT_object_game(bpy.types.Menu):

diff --git a/source/blender/blenlib/intern/math_rotation.c b/source/blender/blenlib/intern/math_rotation.c
index 291e7babdbbfde0b56251cb1115844de9a687daa..0a92218b9674a1db10b355f0b2ba21ce060dbde2 100644 (file)
--- a/source/blender/blenlib/intern/math_rotation.c
+++ b/source/blender/blenlib/intern/math_rotation.c
@@ -1258,7 +1258,7 @@ void eulO_to_mat4(float M[4][4], const float e[3], const short order)
 
 
 /* Convert 3x3 matrix to Euler angles (in radians). */
-void mat3_to_eulO(float eul[3], short order,float M[3][3])
+void mat3_to_eulO(float eul[3], const short order,float M[3][3])
 {
        float eul1[3], eul2[3];
        

diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 1a930e7ff7edc582bd7693f1be7791ff4e8b5e80..ec137d210330bbc7ebd6beaa2d2adc63b54e284f 100644 (file)
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -1382,7 +1382,7 @@ int BLI_testextensie_glob(const char *str, const char *ext_fnmatch)
 
 int BLI_replace_extension(char *path, int maxlen, const char *ext)
 {
-       int a;
+       unsigned int a;
 
        for(a=strlen(path)-1; a>=0; a--)
                if(path[a] == '.' || path[a] == '/' || path[a] == '\\')
@@ -1738,7 +1738,7 @@ void BLI_where_am_i(char *fullname, const int maxlen, const char *name)
        }
 }
 
-void BLI_where_is_temp(char *fullname, int maxlen, int usertemp)
+void BLI_where_is_temp(char *fullname, const int maxlen, int usertemp)
 {
        fullname[0] = '\0';
        

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0958f121fcc869614007a021b60b78a0b3ddc0e7..c8ab53da177cdf7450a05db61c658849a3dc2a4c 100644 (file)
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8604,7 +8604,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                                ima->flag |= IMA_STD_FIELD;
                                }
                                tex->iuser.frames= tex->frames;
-                               tex->iuser.fie_ima= tex->fie_ima;
+                               tex->iuser.fie_ima= (char)tex->fie_ima;
                                tex->iuser.offset= tex->offset;
                                tex->iuser.sfra= tex->sfra;
                                tex->iuser.cycl= (tex->imaflag & TEX_ANIMCYCLIC_)!=0;

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 5ea74cbf40a5014e9538fe5a6060abda8f0fa2a3..63841963c6d14dab5f56efa10d415f60d70ed08b 100644 (file)
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -972,7 +972,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al
        if(di->type == ICON_TYPE_VECTOR) {
                /* vector icons use the uiBlock transformation, they are not drawn
                with untransformed coordinates like the other icons */
-               di->data.vector.func(x, y, ICON_DEFAULT_HEIGHT, ICON_DEFAULT_HEIGHT, 1.0f); 
+               di->data.vector.func((int)x, (int)y, ICON_DEFAULT_HEIGHT, ICON_DEFAULT_HEIGHT, 1.0f); 
        } 
        else if(di->type == ICON_TYPE_TEXTURE) {
                icon_draw_texture(x, y, w, h, di->data.texture.x, di->data.texture.y,

diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 47720049d7dc771fe00de7c718a9577f052d4b05..7f247b9e8159c9a7a28c99cc77512ee87de6f532 100644 (file)
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -2202,7 +2202,7 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i
        
        float tf_uv_pxoffset[4][2]; /* bucket bounds in UV space so we can init pixels only for this face,  */
        float xhalfpx, yhalfpx;
-       const float ibuf_xf = ibuf->x, ibuf_yf = ibuf->y;
+       const float ibuf_xf = (float)ibuf->x, ibuf_yf = (float)ibuf->y;
        
        int has_x_isect = 0, has_isect = 0; /* for early loop exit */
        

diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 022f818d7d757e6959cec662659501b1ff5ccbe5..7c3d0cc9a01f39e9d6c54148ef7858b1ace130c9 100644 (file)
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -202,14 +202,14 @@ void RNA_api_ui_layout(StructRNA *srna)
        RNA_def_function_return(func, parm);
        RNA_def_function_ui_description(func, "Item. Places a button into the layout to call an Operator.");
 
-/*     func= RNA_def_function(srna, "operator_enum", "uiItemEnumO_string");
+/*     func= RNA_def_function(srna, "operator_enum_single", "uiItemEnumO_string");
        api_ui_item_op_common(func);
        parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in operator.");
        RNA_def_property_flag(parm, PROP_REQUIRED);
        parm= RNA_def_string(func, "value", "", 0, "", "Enum property value.");
        RNA_def_property_flag(parm, PROP_REQUIRED); */
 
-       func= RNA_def_function(srna, "operator_enums", "uiItemsEnumO");
+       func= RNA_def_function(srna, "operator_enum", "uiItemsEnumO");
        parm= RNA_def_string(func, "operator", "", 0, "", "Identifier of the operator.");
        RNA_def_property_flag(parm, PROP_REQUIRED);
        parm= RNA_def_string(func, "property", "", 0, "", "Identifier of property in operator.");

diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index a70ea2e9b4a0eb5d67fc1f3c0f1c8a774aca379d..cb527f562eb203c02c05842dd65573fa91c46fde 100644 (file)
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -137,7 +137,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
        ot= WM_operatortype_find(opname, TRUE);
 
        if (ot == NULL) {
-               PyErr_Format(PyExc_LookupError, "Calling operator \"bpy.ops.%s\" error, could not be found", opname);
+               PyErr_Format(PyExc_AttributeError, "Calling operator \"bpy.ops.%s\" error, could not be found", opname);
                return NULL;
        }
        

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 534aab94adadcd798c815012e4a3c65c60df5cc2..d61e42c2353e2bf8543609752a33a55cbad0e7a2 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -722,7 +722,7 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op)
        /* fake button, it holds space for search items */
        uiDefBut(block, LABEL, 0, "", 10, 10 - uiSearchBoxhHeight(), 180, uiSearchBoxhHeight(), NULL, 0, 0, 0, 0, NULL);
 
-       uiPopupBoundsBlock(block, 6.0f, 0, -20); /* move it downwards, mouse over button */
+       uiPopupBoundsBlock(block, 6, 0, -20); /* move it downwards, mouse over button */
        uiEndBlock(C, block);
 
        event= *(win->eventstate);      /* XXX huh huh? make api call */