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:
authorCampbell Barton <ideasman42@gmail.com>2009-11-22 13:02:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-11-22 13:02:32 +0300
commitadb14a2247f5f8cff939e1b662daac598eedf2de (patch)
tree7193dda3881322d8680b782c71b2cf5325f511ec
parent8f8d5d3bdc8a0b531255acd4f4db33c5e442bf9a (diff)
remove template uiTemplate_view3d_select_faceselmenu
-rw-r--r--release/scripts/op/presets.py2
-rw-r--r--release/scripts/ui/space_view3d.py5
-rw-r--r--source/blender/editors/include/UI_interface.h1
-rw-r--r--source/blender/editors/space_view3d/view3d_header.c13
-rw-r--r--source/blender/makesrna/intern/rna_ui_api.c4
-rw-r--r--source/blender/python/intern/bpy_rna.c1
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c3
7 files changed, 8 insertions, 21 deletions
diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py
index 71044956816..7088fb1adc9 100644
--- a/release/scripts/op/presets.py
+++ b/release/scripts/op/presets.py
@@ -42,7 +42,7 @@ class AddPresetRender(AddPresetBase):
class AddPresetSSS(AddPresetBase):
bl_idname = "material.sss_preset_add"
- bl_label = "Add Render Preset"
+ bl_label = "Add SSS Preset"
name = AddPresetBase.name
preset_values = [
diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py
index 6f7d97b828a..c1b3dd8524c 100644
--- a/release/scripts/ui/space_view3d.py
+++ b/release/scripts/ui/space_view3d.py
@@ -557,8 +557,9 @@ class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum
def draw(self, context):
layout = self.layout
-
- layout.view3d_select_faceselmenu()
+
+ # TODO
+ # see view3d_select_faceselmenu
# ********** Object menu **********
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 78992769725..82ff756f601 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -638,7 +638,6 @@ void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *i
void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
void uiTemplateOperatorSearch(uiLayout *layout);
void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
-void uiTemplate_view3d_select_faceselmenu(uiLayout *layout, struct bContext *C);
void uiTemplateTextureImage(uiLayout *layout, struct bContext *C, struct Tex *tex);
void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activeprop, int rows, int type);
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index 11b5f1858c5..5a4eb419c95 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -551,9 +551,10 @@ static uiBlock *view3d_select_object_groupedmenu(bContext *C, ARegion *ar, void
#endif
+// TODO - port to python
+#if 0
void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
{
-#if 0
/* events >= 6 are registered bpython scripts */
#ifndef DISABLE_PYTHON
if (event >= 6) BPY_menu_do_python(PYMENU_FACESELECT, event - 6);
@@ -573,7 +574,6 @@ void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
select_linked_tfaces(2);
break;
}
-#endif
}
static uiBlock *view3d_select_faceselmenu(bContext *C, ARegion *ar, void *arg_unused)
@@ -620,14 +620,7 @@ static uiBlock *view3d_select_faceselmenu(bContext *C, ARegion *ar, void *arg_un
uiTextBoundsBlock(block, 50);
return block;
}
-
-/* wrapper for python layouts */
-void uiTemplate_view3d_select_faceselmenu(uiLayout *layout, bContext *C)
-{
- void *arg_unused = NULL;
- ARegion *ar= CTX_wm_region(C);
- view3d_select_faceselmenu(C, ar, arg_unused);
-}
+#endif
#if 0
void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event)
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index ad4557f76a1..aaf011e3e49 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -343,10 +343,6 @@ void RNA_api_ui_layout(StructRNA *srna)
func= RNA_def_function(srna, "template_header_3D", "uiTemplateHeader3D");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
-
- func= RNA_def_function(srna, "view3d_select_faceselmenu", "uiTemplate_view3d_select_faceselmenu");
- RNA_def_function_flag(func, FUNC_USE_CONTEXT);
}
-
#endif
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index b0129ce25a0..d25a240990b 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1,4 +1,3 @@
-
/**
* $Id$
*
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 61e298f173a..f8bf84a14fb 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -196,7 +196,6 @@ ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct Poin
void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){}
void uiTemplateOperatorSearch(struct uiLayout *layout){}
void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C){}
-void uiTemplate_view3d_select_faceselmenu(struct uiLayout *layout, struct bContext *C){}
void uiTemplateTextureImage(struct uiLayout *layout, struct bContext *C, struct Tex *tex){}
void uiTemplateImage(struct uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *userptr, int compact){}
@@ -281,4 +280,4 @@ int CSG_PerformBooleanOperation(
CSG_VertexIteratorDescriptor obAVertices,
CSG_FaceIteratorDescriptor obBFaces,
CSG_VertexIteratorDescriptor obBVertices)
- { return 0;} \ No newline at end of file
+ { return 0;}