From d3d2e92fccc7ed65d753dbf8872b720ffe0fd6ad Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Mon, 31 May 2010 23:44:43 +0000 Subject: synched branch with trunk at revision 29109 --- source/blender/editors/object/object_intern.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/object/object_intern.h') diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 7e1f2cbbfdc..5b446b3a828 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -85,6 +85,11 @@ void OBJECT_OT_shade_flat(struct wmOperatorType *ot); void OBJECT_OT_paths_calculate(struct wmOperatorType *ot); void OBJECT_OT_paths_clear(struct wmOperatorType *ot); +void OBJECT_OT_game_property_new(struct wmOperatorType *ot); +void OBJECT_OT_game_property_remove(struct wmOperatorType *ot); +void OBJECT_OT_game_property_copy(struct wmOperatorType *ot); +void OBJECT_OT_logic_bricks_copy(struct wmOperatorType *ot); + /* object_select.c */ void OBJECT_OT_select_all(struct wmOperatorType *ot); void OBJECT_OT_select_inverse(struct wmOperatorType *ot); @@ -100,7 +105,6 @@ void OBJECT_OT_select_same_group(struct wmOperatorType *ot); /* object_add.c */ void OBJECT_OT_add(struct wmOperatorType *ot); void OBJECT_OT_add_named(struct wmOperatorType *ot); -void OBJECT_OT_curve_add(struct wmOperatorType *ot); void OBJECT_OT_surface_add(struct wmOperatorType *ot); void OBJECT_OT_metaball_add(struct wmOperatorType *ot); void OBJECT_OT_text_add(struct wmOperatorType *ot); @@ -160,10 +164,12 @@ void OBJECT_OT_explode_refresh(struct wmOperatorType *ot); /* object_constraint.c */ void OBJECT_OT_constraint_add(struct wmOperatorType *ot); void OBJECT_OT_constraint_add_with_targets(struct wmOperatorType *ot); -void OBJECT_OT_constraint_copy(struct wmOperatorType *ot); void POSE_OT_constraint_add(struct wmOperatorType *ot); void POSE_OT_constraint_add_with_targets(struct wmOperatorType *ot); +void OBJECT_OT_constraints_copy(struct wmOperatorType *ot); +void POSE_OT_constraints_copy(struct wmOperatorType *ot); + void OBJECT_OT_constraints_clear(struct wmOperatorType *ot); void POSE_OT_constraints_clear(struct wmOperatorType *ot); @@ -201,9 +207,6 @@ void OBJECT_OT_vertex_group_set_active(struct wmOperatorType *ot); void OBJECT_OT_vertex_group_sort(struct wmOperatorType *ot); void OBJECT_OT_vertex_group_move(struct wmOperatorType *ot); -void OBJECT_OT_game_property_new(struct wmOperatorType *ot); -void OBJECT_OT_game_property_remove(struct wmOperatorType *ot); - /* object_shapekey.c */ void OBJECT_OT_shape_key_add(struct wmOperatorType *ot); void OBJECT_OT_shape_key_remove(struct wmOperatorType *ot); -- cgit v1.2.3 From 36e27b07658440117f7bb3dbfee3d5812b6e0e83 Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Fri, 9 Jul 2010 22:16:52 +0000 Subject: Added operator for generating navigation mesh for selected blender objects --- source/blender/editors/object/object_intern.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/editors/object/object_intern.h') diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 5b446b3a828..2a3bffd17d3 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -222,5 +222,8 @@ void OBJECT_OT_group_remove(struct wmOperatorType *ot); /* object_bake.c */ void OBJECT_OT_bake_image(wmOperatorType *ot); +/* object_navmesh.cpp */ +void OBJECT_OT_create_navmesh(struct wmOperatorType *ot); + #endif /* ED_OBJECT_INTERN_H */ -- cgit v1.2.3 From af1ca0cfc17f9663908f23cafb322aa6e2b10782 Mon Sep 17 00:00:00 2001 From: Nick Samarin Date: Tue, 27 Jul 2010 21:01:00 +0000 Subject: - added operators for manual assigning navigation polygon idx to mesh faces in edit mode - modified conversion process to take into account changes caused by mesh editing Note: conversion to dtStatNavMesh in KX_NavMeshObject hasn't worked correctly yet --- source/blender/editors/object/object_intern.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blender/editors/object/object_intern.h') diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index e30a6c555e3..7b2904eed9d 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -224,6 +224,8 @@ void OBJECT_OT_bake_image(wmOperatorType *ot); /* object_navmesh.cpp */ void OBJECT_OT_create_navmesh(struct wmOperatorType *ot); +void OBJECT_OT_assign_navpolygon(struct wmOperatorType *ot); +void OBJECT_OT_assign_new_navpolygon(struct wmOperatorType *ot); #endif /* ED_OBJECT_INTERN_H */ -- cgit v1.2.3