remove template uiTemplate_view3d_select_faceselmenu

diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py
index 71044956816f143e025f2872d72dc06f2d2ab29c..7088fb1adc9ff6f2421cf0ac13a3fc5c74688206 100644 (file)
--- 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 6f7d97b828aa20d7ed81aee2316db47793e053d1..c1b3dd8524c2cd3e6561447da16be8b9f75489da 100644 (file)
--- 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 789927697258de421a9c146c684579d179036b92..82ff756f6014fa6a4b420ab449a14fc3765ce58d 100644 (file)
--- 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 11b5f1858c57b34b8798c19c46bc9784a42896ba..5a4eb419c9560a5cc22a3b3e9e763f172074192d 100644 (file)
--- 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 ad4557f76a165900728ed3c417e730ed297da688..aaf011e3e49172b6a8b25ffc2697f57b97bba859 100644 (file)
--- 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 b0129ce25a0a85f0a724782b3923cd6ce6f39476..d25a240990b85e92a3537c9a6687d3fca54904a7 100644 (file)
--- 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 61e298f173a9224b43beb487c8f0a6a1b46c0737..f8bf84a14fbdb309fb4e7096a89018d1b4b48fc0 100644 (file)
--- 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;}