Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/scripts/io/export_x3d.py2
-rw-r--r--release/scripts/modules/rna_info.py3
-rw-r--r--source/blender/editors/space_view3d/view3d_ops.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py
index d3a8957dd1e..3b396011378 100644
--- a/release/scripts/io/export_x3d.py
+++ b/release/scripts/io/export_x3d.py
@@ -965,7 +965,7 @@ class x3d_class:
# if mesh.faceUV:
for face in mesh.active_uv_texture.data:
# for face in mesh.faces
- sidename = "two" if face.use_twoside else "one":
+ sidename = "two" if face.use_twoside else "one"
if sidename in sided:
sided[sidename]+=1
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py
index 98cd4bcbd3a..0a93121c559 100644
--- a/release/scripts/modules/rna_info.py
+++ b/release/scripts/modules/rna_info.py
@@ -595,7 +595,7 @@ def BuildRNAInfo():
op_mods = dir(bpy.ops)
for op_mod_name in sorted(op_mods):
- if op_mod_name.startswith('__') or op_mod_name in ("add", "remove"):
+ if op_mod_name.startswith('__'):
continue
op_mod = getattr(bpy.ops, op_mod_name)
@@ -647,6 +647,7 @@ if __name__ == "__main__":
if bpy.app.background:
import sys
sys.stderr.write("\n".join(data))
+ sys.stderr.write("\n\nEOF\n")
else:
text = bpy.data.texts.new(name="api.py")
text.from_string(data)
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index 6768141e6d9..9ee12a8ef1e 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -275,7 +275,7 @@ void view3d_keymap(wmKeyConfig *keyconf)
RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point_align");
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* new in 2.5 */
- RNA_string_set(kmi->ptr, "data_path", "space_data.manipulator");
+ RNA_string_set(kmi->ptr, "data_path", "space_data.show_manipulator");
kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", PERIODKEY, KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "data_path", "space_data.pivot_point");