diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-09-20 21:51:04 +0400 |
| commit | 15cb47bf91820aac3a3881e94378067472c07e1b (patch) | |
| tree | f8db8dd34c6a0b660ad1816e002c9ef3af939b00 /source/blenderplayer | |
| parent | 9de082dbf4130b48d59e673ed276a046d97cc1e4 (diff) | |
| parent | bc788a3607eda1889c7f0fe2201116826a9394ee (diff) | |
Merge with trunk r40409
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index ddfdfc97bdc..c8bf3b002f1 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -138,6 +138,7 @@ endif() bf_intern_ghost # duplicate for linking bf_blenkernel # duplicate for linking bf_intern_mikktspace + extern_recastnavigation ) if(WITH_MOD_CLOTH_ELTOPO) diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index d5974042f40..f7a748e1369 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -81,6 +81,7 @@ struct SculptSession; struct ShadeInput; struct ShadeResult; struct SpaceImage; +struct SpaceNode; struct Tex; struct TexResult; struct Text; @@ -105,7 +106,6 @@ struct bConstraintOb; struct Context; struct ChannelDriver; - /*new render funcs */ float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) {return (float *) NULL;} float RE_filter_value(int type, float x) {return 0.0f;} @@ -192,7 +192,6 @@ void ED_update_for_newframe(struct Main *bmain, struct Scene *scene, struct bScr struct EditBone *ED_armature_bone_get_mirrored(struct ListBase *edbo, struct EditBone *ebo){return (struct EditBone *) NULL;} struct EditBone *ED_armature_edit_bone_add(struct bArmature *arm, char *name){return (struct EditBone*) NULL;} -struct Object *ED_object_pose_armature(struct Object *ob){ return (struct Object *)NULL; } struct ListBase *get_active_constraints (struct Object *ob){return (struct ListBase *) NULL;} struct ListBase *get_constraint_lb(struct Object *ob, struct bConstraint *con, struct bPoseChannel **pchan_r){return (struct ListBase *) NULL;} int ED_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan){return 0;} @@ -255,6 +254,7 @@ void WM_cursor_wait (int val) {} void ED_node_texture_default(struct Tex *tx){} void ED_node_changed_update(struct bContext *C, struct bNode *node){} void ED_node_generic_update(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node){} +void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene){} void ED_view3d_scene_layers_update(struct Main *bmain, struct Scene *scene){} int ED_view3d_scene_layer_set(int lay, const int *values){return 0;} void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar){} @@ -306,8 +306,6 @@ void ED_sequencer_update_view(struct bContext *C, int view){} float ED_rollBoneToVector(struct EditBone *bone, float new_up_axis[3]){return 0.0f;} void ED_space_image_size(struct SpaceImage *sima, int *width, int *height){} -struct ListBase *ED_curve_editnurbs(struct Curve *cu){return NULL;} -void free_curve_editNurb (struct Curve *cu){} void ED_nurb_set_spline_type(struct Nurb *nu, int type){} void EM_selectmode_set(struct EditMesh *em){} |