[Bf-blender-cvs] [31e43d021fd] soc-2018-bevel: Merge branch 'blender2.8' into soc-2018-bevel
Rohan Rathi
noreply at git.blender.org
Mon Jul 2 20:01:38 CEST 2018
Commit: 31e43d021fdc55c6ec6741d382f4bbb05d1d62e9
Author: Rohan Rathi
Date: Mon Jul 2 23:31:19 2018 +0530
Branches: soc-2018-bevel
https://developer.blender.org/rB31e43d021fdc55c6ec6741d382f4bbb05d1d62e9
Merge branch 'blender2.8' into soc-2018-bevel
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_screen.h
index 204c5fa5956,0e335f89fb4..1a7055e2cfa
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -257,61 -265,89 +265,90 @@@ void ED_keymap_screen(struct wmKeyCo
void ED_operatortypes_workspace(void);
/* operators; context poll callbacks */
- int ED_operator_screenactive(struct bContext *C);
- int ED_operator_screen_mainwinactive(struct bContext *C);
- int ED_operator_areaactive(struct bContext *C);
- int ED_operator_regionactive(struct bContext *C);
-
- int ED_operator_scene(struct bContext *C);
- int ED_operator_scene_editable(struct bContext *C);
- int ED_operator_objectmode(struct bContext *C);
-
- int ED_operator_view3d_active(struct bContext *C);
- int ED_operator_region_view3d_active(struct bContext *C);
- int ED_operator_animview_active(struct bContext *C);
- int ED_operator_outliner_active(struct bContext *C);
- int ED_operator_outliner_active_no_editobject(struct bContext *C);
- int ED_operator_file_active(struct bContext *C);
- int ED_operator_action_active(struct bContext *C);
- int ED_operator_buttons_active(struct bContext *C);
- int ED_operator_node_active(struct bContext *C);
- int ED_operator_node_editable(struct bContext *C);
- int ED_operator_graphedit_active(struct bContext *C);
- int ED_operator_sequencer_active(struct bContext *C);
- int ED_operator_sequencer_active_editable(struct bContext *C);
- int ED_operator_image_active(struct bContext *C);
- int ED_operator_nla_active(struct bContext *C);
- int ED_operator_info_active(struct bContext *C);
- int ED_operator_console_active(struct bContext *C);
-
-
- int ED_operator_object_active(struct bContext *C);
- int ED_operator_object_active_editable(struct bContext *C);
- int ED_operator_object_active_editable_mesh(struct bContext *C);
- int ED_operator_object_active_editable_font(struct bContext *C);
- int ED_operator_editmesh(struct bContext *C);
- int ED_operator_editmesh_view3d(struct bContext *C);
- int ED_operator_editmesh_region_view3d(struct bContext *C);
- int ED_operator_editmesh_auto_smooth(struct bContext *C);
- int ED_operator_editarmature(struct bContext *C);
- int ED_operator_editcurve(struct bContext *C);
- int ED_operator_editcurve_3d(struct bContext *C);
- int ED_operator_editsurf(struct bContext *C);
- int ED_operator_editsurfcurve(struct bContext *C);
- int ED_operator_editsurfcurve_region_view3d(struct bContext *C);
- int ED_operator_editfont(struct bContext *C);
- int ED_operator_editlattice(struct bContext *C);
- int ED_operator_editmball(struct bContext *C);
- int ED_operator_uvedit(struct bContext *C);
- int ED_operator_uvedit_space_image(struct bContext *C);
- int ED_operator_uvmap(struct bContext *C);
- int ED_operator_posemode_exclusive(struct bContext *C);
- int ED_operator_posemode_context(struct bContext *C);
- int ED_operator_posemode(struct bContext *C);
- int ED_operator_posemode_local(struct bContext *C);
- int ED_operator_mask(struct bContext *C);
- int ED_operator_camera(struct bContext *C);
-
+ bool ED_operator_screenactive(struct bContext *C);
+ bool ED_operator_screen_mainwinactive(struct bContext *C);
+ bool ED_operator_areaactive(struct bContext *C);
+ bool ED_operator_regionactive(struct bContext *C);
+
+ bool ED_operator_scene(struct bContext *C);
+ bool ED_operator_scene_editable(struct bContext *C);
+ bool ED_operator_objectmode(struct bContext *C);
+
+ bool ED_operator_view3d_active(struct bContext *C);
+ bool ED_operator_region_view3d_active(struct bContext *C);
+ bool ED_operator_animview_active(struct bContext *C);
+ bool ED_operator_outliner_active(struct bContext *C);
+ bool ED_operator_outliner_active_no_editobject(struct bContext *C);
+ bool ED_operator_file_active(struct bContext *C);
+ bool ED_operator_action_active(struct bContext *C);
+ bool ED_operator_buttons_active(struct bContext *C);
+ bool ED_operator_node_active(struct bContext *C);
+ bool ED_operator_node_editable(struct bContext *C);
+ bool ED_operator_graphedit_active(struct bContext *C);
+ bool ED_operator_sequencer_active(struct bContext *C);
+ bool ED_operator_sequencer_active_editable(struct bContext *C);
+ bool ED_operator_image_active(struct bContext *C);
+ bool ED_operator_nla_active(struct bContext *C);
+ bool ED_operator_info_active(struct bContext *C);
+ bool ED_operator_console_active(struct bContext *C);
+
+
+ bool ED_operator_object_active(struct bContext *C);
+ bool ED_operator_object_active_editable(struct bContext *C);
+ bool ED_operator_object_active_editable_mesh(struct bContext *C);
+ bool ED_operator_object_active_editable_font(struct bContext *C);
+ bool ED_operator_editmesh(struct bContext *C);
+ bool ED_operator_editmesh_view3d(struct bContext *C);
+ bool ED_operator_editmesh_region_view3d(struct bContext *C);
++bool ED_operator_editmesh_auto_smooth(struct bContext *C);
+ bool ED_operator_editarmature(struct bContext *C);
+ bool ED_operator_editcurve(struct bContext *C);
+ bool ED_operator_editcurve_3d(struct bContext *C);
+ bool ED_operator_editsurf(struct bContext *C);
+ bool ED_operator_editsurfcurve(struct bContext *C);
+ bool ED_operator_editsurfcurve_region_view3d(struct bContext *C);
+ bool ED_operator_editfont(struct bContext *C);
+ bool ED_operator_editlattice(struct bContext *C);
+ bool ED_operator_editmball(struct bContext *C);
+ bool ED_operator_uvedit(struct bContext *C);
+ bool ED_operator_uvedit_space_image(struct bContext *C);
+ bool ED_operator_uvmap(struct bContext *C);
+ bool ED_operator_posemode_exclusive(struct bContext *C);
+ bool ED_operator_posemode_context(struct bContext *C);
+ bool ED_operator_posemode(struct bContext *C);
+ bool ED_operator_posemode_local(struct bContext *C);
+ bool ED_operator_mask(struct bContext *C);
+ bool ED_operator_camera(struct bContext *C);
+
+ /* screen_user_menu.c */
+
+ struct bUserMenu *ED_screen_user_menu_find(struct bContext *C);
+ struct bUserMenu *ED_screen_user_menu_ensure(struct bContext *C);
+
+
+ struct bUserMenuItem_Op *ED_screen_user_menu_item_find_operator(
+ struct ListBase *lb,
+ const struct wmOperatorType *ot, struct IDProperty *prop, short opcontext);
+ struct bUserMenuItem_Menu *ED_screen_user_menu_item_find_menu(
+ struct ListBase *lb,
+ const struct MenuType *mt);
+ struct bUserMenuItem_Prop *ED_screen_user_menu_item_find_prop(
+ struct ListBase *lb,
+ const char *context_data_path, const char *prop_id, int prop_index);
+
+ void ED_screen_user_menu_item_add_operator(
+ struct ListBase *lb, const char *ui_name,
+ const struct wmOperatorType *ot, const struct IDProperty *prop, short opcontext);
+ void ED_screen_user_menu_item_add_menu(
+ struct ListBase *lb, const char *ui_name,
+ const struct MenuType *mt);
+ void ED_screen_user_menu_item_add_prop(
+ ListBase *lb, const char *ui_name,
+ const char *context_data_path, const char *prop_id, int prop_index);
+
+ void ED_screen_user_menu_item_remove(
+ struct ListBase *lb, struct bUserMenuItem *umi);
+ void ED_screen_user_menu_register(void);
/* Cache display helpers */
diff --cc source/blender/editors/mesh/mesh_ops.c
index 546c000d726,ff94223c815..09d6ea7226a
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@@ -515,6 -524,4 +535,5 @@@ void ED_keymap_mesh(wmKeyConfig *keycon
ED_keymap_proportional_editmode(keyconf, keymap, true);
knifetool_modal_keymap(keyconf);
+ point_normals_modal_keymap(keyconf);
}
-
diff --cc source/blender/editors/screen/screen_ops.c
index e08755c84c6,188592d6129..fb269740109
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@@ -360,16 -359,7 +360,16 @@@ bool ED_operator_editmesh_region_view3d
return 0;
}
- int ED_operator_editmesh_auto_smooth(bContext *C)
++bool ED_operator_editmesh_auto_smooth(bContext *C)
+{
+ Object *obedit = CTX_data_edit_object(C);
+ if (obedit && obedit->type == OB_MESH && (((Mesh *)(obedit->data))->flag & ME_AUTOSMOOTH)) {
+ return NULL != BKE_editmesh_from_object(obedit);
+ }
+ return 0;
+}
+
- int ED_operator_editarmature(bContext *C)
+ bool ED_operator_editarmature(bContext *C)
{
Object *obedit = CTX_data_edit_object(C);
if (obedit && obedit->type == OB_ARMATURE)
diff --cc source/blender/modifiers/intern/MOD_bevel.c
index b30d6c2e669,64d1a6c310b..aa12093b505
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@@ -32,14 -32,11 +32,15 @@@
* \ingroup modifiers
*/
+#include "MEM_guardedalloc.h"
+
- #include "DNA_object_types.h"
#include "DNA_mesh_types.h"
+ #include "DNA_meshdata_types.h"
+ #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
+#include "BLI_linklist_stack.h"
#include "BLI_math.h"
#include "BLI_string.h"
More information about the Bf-blender-cvs
mailing list