archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

remove template uiTemplate_view3d_select_faceselmenu

Browse Source
This commit is contained in:
Campbell Barton
2009-11-22 10:02:32 +00:00
parent 8f8d5d3bdc
commit adb14a2247
7 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/op/presets.py
View File

@@ -42,7 +42,7 @@ class AddPresetRender(AddPresetBase):
class AddPresetSSS(AddPresetBase): class AddPresetSSS(AddPresetBase):
bl_idname = "material.sss_preset_add" bl_idname = "material.sss_preset_add"
bl_label = "Add Render Preset" bl_label = "Add SSS Preset"
name = AddPresetBase.name name = AddPresetBase.name
preset_values = [ preset_values = [

5
release/scripts/ui/space_view3d.py
View File

@@ -557,8 +557,9 @@ class VIEW3D_MT_select_face(bpy.types.Menu):# XXX no matching enum
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.view3d_select_faceselmenu() # TODO
# see view3d_select_faceselmenu
# ********** Object menu ********** # ********** Object menu **********

1
source/blender/editors/include/UI_interface.h
View File

@@ -638,7 +638,6 @@ void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *i
void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C); void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
void uiTemplateOperatorSearch(uiLayout *layout); void uiTemplateOperatorSearch(uiLayout *layout);
void uiTemplateHeader3D(uiLayout *layout, struct bContext *C); 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 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); void uiTemplateList(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname, struct PointerRNA *activeptr, char *activeprop, int rows, int type);

13
source/blender/editors/space_view3d/view3d_header.c
View File

@@ -551,9 +551,10 @@ static uiBlock *view3d_select_object_groupedmenu(bContext *C, ARegion *ar, void
#endif #endif
// TODO - port to python
#if 0
void do_view3d_select_faceselmenu(bContext *C, void *arg, int event) void do_view3d_select_faceselmenu(bContext *C, void *arg, int event)
{ {
#if 0
/* events >= 6 are registered bpython scripts */ /* events >= 6 are registered bpython scripts */
#ifndef DISABLE_PYTHON #ifndef DISABLE_PYTHON
if (event >= 6) BPY_menu_do_python(PYMENU_FACESELECT, event - 6); 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); select_linked_tfaces(2);
break; break;
} }
#endif
} }
static uiBlock *view3d_select_faceselmenu(bContext *C, ARegion *ar, void *arg_unused) 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); uiTextBoundsBlock(block, 50);
return block; return block;
} }
#endif
/* 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);
}
#if 0 #if 0
void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event) void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event)

4
source/blender/makesrna/intern/rna_ui_api.c
View File

@@ -343,10 +343,6 @@ void RNA_api_ui_layout(StructRNA *srna)
func= RNA_def_function(srna, "template_header_3D", "uiTemplateHeader3D"); func= RNA_def_function(srna, "template_header_3D", "uiTemplateHeader3D");
RNA_def_function_flag(func, FUNC_USE_CONTEXT); 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 #endif

1
source/blender/python/intern/bpy_rna.c
View File

@@ -1,4 +1,3 @@
/** /**
* $Id$ * $Id$
* *

3
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@@ -196,7 +196,6 @@ ListBase uiTemplateList(struct uiLayout *layout, struct bContext *C, struct Poin
void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){} void uiTemplateRunningJobs(struct uiLayout *layout, struct bContext *C){}
void uiTemplateOperatorSearch(struct uiLayout *layout){} void uiTemplateOperatorSearch(struct uiLayout *layout){}
void uiTemplateHeader3D(struct uiLayout *layout, struct bContext *C){} 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 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){} 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_VertexIteratorDescriptor obAVertices,
CSG_FaceIteratorDescriptor obBFaces, CSG_FaceIteratorDescriptor obBFaces,
CSG_VertexIteratorDescriptor obBVertices) CSG_VertexIteratorDescriptor obBVertices)
{ return 0;} { return 0;}