remove unneeded string in datatoc.c and correct some of the context types in our...

diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 9cc37adcbc90ddc8e8f7b1a8bdd8d4e5a5112c70..6f7d4f3582a51b398462f5406a4f6dd1f15cc9b0 100644 (file)
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -913,7 +913,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
 # Changes in blender will force errors here
 context_type_map = {
     "active_base": ("ObjectBase", False),
-    "active_bone": ("Bone", False),
+    "active_bone": ("EditBone", False),
     "active_object": ("Object", False),
     "active_operator": ("Operator", False),
     "active_pose_bone": ("PoseBone", False),
@@ -952,9 +952,9 @@ context_type_map = {
     "selectable_bases": ("ObjectBase", True),
     "selectable_objects": ("Object", True),
     "selected_bases": ("ObjectBase", True),
-    "selected_bones": ("Bone", True),
+    "selected_bones": ("EditBone", True),
     "selected_editable_bases": ("ObjectBase", True),
-    "selected_editable_bones": ("Bone", True),
+    "selected_editable_bones": ("EditBone", True),
     "selected_editable_objects": ("Object", True),
     "selected_editable_sequences": ("Sequence", True),
     "selected_nodes": ("Node", True),
@@ -970,7 +970,7 @@ context_type_map = {
     "texture_user": ("ID", False),
     "vertex_paint_object": ("Object", False),
     "visible_bases": ("ObjectBase", True),
-    "visible_bones": ("Object", True),
+    "visible_bones": ("EditBone", True),
     "visible_objects": ("Object", True),
     "visible_pose_bones": ("PoseBone", True),
     "weight_paint_object": ("Object", False),

diff --git a/source/blender/datatoc/datatoc.c b/source/blender/datatoc/datatoc.c
index a7da037ff16befe83b536f2d3d5f32ef875584b3..379658bb4c4840559c9c2218a3da9e18e336e4b9 100644 (file)
--- a/source/blender/datatoc/datatoc.c
+++ b/source/blender/datatoc/datatoc.c
@@ -49,7 +49,6 @@ static char *basename(char *string)
 int main(int argc, char **argv)
 {
        FILE *fpin,  *fpout;
-       char sizest[256];
        long size;
        int i;
 
@@ -79,8 +78,6 @@ int main(int argc, char **argv)
        for (i = 0; i < (int)strlen(argv[1]); i++)
                if (argv[1][i] == '.') argv[1][i] = '_';
 
-       sprintf(sizest, "%d", (int)size);
-
        fpout = fopen(argv[2], "w");
        if (!fpout) {
                fprintf(stderr, "Unable to open output <%s>\n", argv[2]);
@@ -88,7 +85,7 @@ int main(int argc, char **argv)
        }
 
        fprintf(fpout, "/* DataToC output of file <%s> */\n\n", argv[1]);
-       fprintf(fpout, "int datatoc_%s_size = %s;\n", argv[1], sizest);
+       fprintf(fpout, "int datatoc_%s_size = %d;\n", argv[1], (int)size);
        fprintf(fpout, "char datatoc_%s[] = {\n", argv[1]);
        while (size--) {
                /* if we want to open in an editor