From 19e5540ff7712a45ab4ced4a4a02b12ce02637a9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 21 Apr 2016 11:29:32 +1000 Subject: Transform Snap: initial snap context refactor This introduces a snap-context that can be re-used for casting rays into the scene (by operators such as walk-mode, ruler and transform code). This can be used to cache data between calls too. --- source/blenderplayer/bad_level_call_stubs/stubs.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'source/blenderplayer') diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index dfe7a03719a..1121bb95c07 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -519,11 +519,18 @@ bool ED_texture_context_check_others(const struct bContext *C) RET_ZERO bool ED_text_region_location_from_cursor(SpaceText *st, ARegion *ar, const int cursor_co[2], int r_pixel_co[2]) RET_ZERO -bool snapObjectsRayEx( - struct Scene *scene, struct View3D *v3d, struct ARegion *ar, struct Base *base_act, struct Object *obedit, - const float mval[2], SnapSelect snap_select, short snap_mode, - const float ray_start[3], const float ray_normal[3], float *ray_dist, - float r_loc[3], float r_no[3], float *r_dist_px, int *r_index, +SnapObjectContext *ED_transform_snap_object_context_create( + struct Main *bmain, struct Scene *scene, int flag) RET_NULL +SnapObjectContext *ED_transform_snap_object_context_create_view3d( + struct Main *bmain, struct Scene *scene, int flag, + struct ARegion *ar, struct View3D *v3d) RET_NULL +void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE +bool ED_transform_snap_object_project_ray_ex( + struct SnapObjectContext *sctx, + const struct SnapObjectParams *params, + const float ray_start[3], const float ray_normal[3], float *ray_depth, + /* return args */ + float r_loc[3], float r_no[3], int *r_index, struct Object **r_ob, float r_obmat[4][4]) RET_ZERO void ED_lattice_editlatt_make(struct Object *obedit) RET_NONE -- cgit v1.2.3 From c41b2bd7c6771d48339f95da9dd34a7d2589e0d0 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 22 Apr 2016 16:48:57 +0200 Subject: Fix T48223: 3D View not refresh after changing Blending mode in NLA. This fixes a lot of things in NLA RNA update handling (which basically did not update anything previously). There are more update issues with this editor though... --- source/blenderplayer/bad_level_call_stubs/stubs.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/blenderplayer') diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 1121bb95c07..430115a0bbd 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -148,6 +148,7 @@ struct wmWindowManager; #include "../blender/collada/collada.h" #include "../blender/compositor/COM_compositor.h" #include "../blender/editors/include/ED_armature.h" +#include "../blender/editors/include/ED_anim_api.h" #include "../blender/editors/include/ED_buttons.h" #include "../blender/editors/include/ED_clip.h" #include "../blender/editors/include/ED_curve.h" @@ -419,6 +420,7 @@ void delete_fcurve_key(struct FCurve *fcu, int index, bool do_recalc) RET_NONE struct KeyingSetInfo *ANIM_keyingset_info_find_name (const char name[]) RET_NULL struct KeyingSet *ANIM_scene_get_active_keyingset (struct Scene *scene) RET_NULL int ANIM_scene_get_keyingset_index(struct Scene *scene, struct KeyingSet *ks) RET_ZERO +void ANIM_id_update(struct Scene *scene, struct ID *id) RET_NONE struct ListBase builtin_keyingsets; void ANIM_keyingset_info_register(struct KeyingSetInfo *ksi) RET_NONE void ANIM_keyingset_info_unregister(struct Main *bmain, KeyingSetInfo *ksi) RET_NONE -- cgit v1.2.3