diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-04 21:16:34 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-04 21:16:34 +0300 |
commit | 9e7643aa7c25ce551bfe59905fbf56156e264824 (patch) | |
tree | 7664a0ae5f539b9d9fb7ac476c78377373a80afb /source/blender/editors | |
parent | 3aeb63cad2340d92c17df375bbe55629299661c0 (diff) |
2.5 / Cleanup
- remove Verse support. This will be brought back in The Future (probably jiri + me)
This means 5k lines less in blenkernel.
- fix two small errors for global cleanup, now compiles properly with FFMPEG enabled too.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/editors/screen/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/editors/space_outliner/outliner.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 7 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 23 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 59 |
6 files changed, 8 insertions, 105 deletions
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 19a91d08d08..15c0bca8ffb 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -71,11 +71,6 @@ IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) -IF(WITH_VERSE) - SET(INC ${INC} ${VERSE_INC}) - ADD_DEFINITIONS(-DWITH_VERSE) -ENDIF(WITH_VERSE) - # TODO buildinfo IF(BF_BUILDINFO) ADD_DEFINITIONS(-DNAN_BUILDINFO) @@ -83,7 +78,3 @@ ENDIF(BF_BUILDINFO) BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}") -IF(WITH_VERSE) - ADD_DEPENDENCIES(bf_editors mkprot verse) -ENDIF(WITH_VERSE) - diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index c6d1288cf4f..42480f65268 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -74,11 +74,6 @@ IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) -IF(WITH_VERSE) - SET(INC ${INC} ${VERSE_INC}) - ADD_DEFINITIONS(-DWITH_VERSE) -ENDIF(WITH_VERSE) - # TODO buildinfo IF(BF_BUILDINFO) ADD_DEFINITIONS(-DNAN_BUILDINFO) @@ -86,7 +81,3 @@ ENDIF(BF_BUILDINFO) BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}") -IF(WITH_VERSE) - ADD_DEPENDENCIES(bf_editors mkprot verse) -ENDIF(WITH_VERSE) - diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index c7f49a31938..cfae1b127cf 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -3588,7 +3588,7 @@ static void outliner_draw_tree_element(Scene *scene, ARegion *ar, SpaceOops *soo /* open/close icon, only when sublevels, except for scene */ if(te->subtree.first || (tselem->type==0 && te->idcode==ID_SCE) || (te->flag & TE_LAZY_CLOSED)) { int icon_x; - if((tselem->type==0 && ELEM(te->idcode, ID_OB, ID_SCE)) || ELEM4(te->idcode,ID_VN,ID_VS, ID_MS, ID_SS)) + if(tselem->type==0 && ELEM(te->idcode, ID_OB, ID_SCE)) icon_x = startx; else icon_x = startx+5; @@ -3680,7 +3680,7 @@ static void outliner_draw_hierarchy(SpaceOops *soops, ListBase *lb, int startx, tselem= TREESTORE(te); /* horizontal line? */ - if((tselem->type==0 && (te->idcode==ID_OB || te->idcode==ID_SCE)) || ELEM4(te->idcode,ID_VS,ID_VN,ID_MS,ID_SS)) + if(tselem->type==0 && (te->idcode==ID_OB || te->idcode==ID_SCE)) glRecti(startx, *starty, startx+OL_X, *starty-1); *starty-= OL_H; @@ -3693,7 +3693,7 @@ static void outliner_draw_hierarchy(SpaceOops *soops, ListBase *lb, int startx, te= lb->last; if(te->parent || lb->first!=lb->last) { tselem= TREESTORE(te); - if((tselem->type==0 && te->idcode==ID_OB) || ELEM4(te->idcode,ID_VS,ID_VN,ID_MS,ID_SS)) { + if(tselem->type==0 && te->idcode==ID_OB) { glRecti(startx, y1+OL_H, startx+1, y2); } diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 806afa8e624..3f123300c5a 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -170,9 +170,6 @@ typedef struct TransData { void *extra; /* extra data (mirrored element pointer, in editmode mesh to EditVert) (editbone for roll fixing) (...) */ short flag; /* Various flags */ short protectflag; /* If set, copy of Object or PoseChannel protection */ -/*#ifdef WITH_VERSE*/ - void *verse; /* pointer at verse data struct (VerseVert, etc.) */ -/*#endif*/ } TransData; typedef struct MouseInput { @@ -318,10 +315,6 @@ typedef struct TransInfo { #define TD_USEQUAT (1 << 3) #define TD_NOTCONNECTED (1 << 4) #define TD_SINGLESIZE (1 << 5) /* used for scaling of MetaElem->rad */ -#ifdef WITH_VERSE - #define TD_VERSE_OBJECT (1 << 6) - #define TD_VERSE_VERT (1 << 7) -#endif #define TD_TIMEONLY (1 << 8) #define TD_NOCENTER (1 << 9) #define TD_NO_EXT (1 << 10) /* ext abused for particle key timing */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index cd06c27e12e..6b633600db7 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1914,15 +1914,6 @@ static void VertsToTransData(TransInfo *t, TransData *td, EditMesh *em, EditVert td->val = &(eve->bweight); td->ival = eve->bweight; } - -#ifdef WITH_VERSE - if(eve->vvert) { - td->verse = (void*)eve->vvert; - td->flag |= TD_VERSE_VERT; - } - else - td->flag &= ~TD_VERSE_VERT; -#endif } /* *********************** CrazySpace correction. Now without doing subsurf optimal ****************** */ @@ -3320,15 +3311,6 @@ static void ObjectToTransData(bContext *C, TransInfo *t, TransData *td, Object * { td->flag |= TD_ACTIVE; } - -#ifdef WITH_VERSE - if(ob->vnode) { - td->verse = (void*)ob; - td->flag |= TD_VERSE_OBJECT; - } - else - td->flag &= ~TD_VERSE_OBJECT; -#endif } @@ -4215,6 +4197,11 @@ void createTransData(bContext *C, TransInfo *t) else if(t->spacetype == SPACE_NODE) { t->flag |= T_2D_EDIT|T_POINTS; createTransNodeData(C, t); + if (t->data && (t->flag & T_PROP_EDIT)) { + sort_trans_data(t); // makes selected become first in array + set_prop_dist(t, 1); + sort_trans_data_dist(t); + } } else if (t->obedit) { t->ext = NULL; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index ea79a559f44..76e2e68e015 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -68,10 +68,6 @@ //#include "BSE_editipo.h" //#include "BSE_editipo_types.h" -#ifdef WITH_VERSE -#include "BIF_verse.h" -#endif - #include "BKE_action.h" #include "BKE_anim.h" #include "BKE_armature.h" @@ -91,10 +87,6 @@ #include "BKE_utildefines.h" #include "BKE_context.h" -#ifdef WITH_VERSE -#include "BKE_verse.h" -#endif - #include "ED_view3d.h" #include "ED_mesh.h" @@ -272,9 +264,6 @@ void recalcData(TransInfo *t) { Scene *scene = t->scene; Base *base; -#ifdef WITH_VERSE - struct TransData *td; -#endif #if 0 // TRANSFORM_FIX_ME if (t->spacetype == SPACE_ACTION) { @@ -639,17 +628,6 @@ void recalcData(TransInfo *t) } } -#ifdef WITH_VERSE - for (td = t->data; td < t->data + t->total; td++) { - if(td->flag & TD_VERSE_VERT) { - if(td->verse) - send_versevert_pos((VerseVert*)td->verse); - } - else if(td->flag & TD_VERSE_OBJECT) - if(td->verse) b_verse_send_transformation((Object*)td->verse); - } -#endif - /* update shaded drawmode while transform */ if(t->spacetype==SPACE_VIEW3D && ((View3D*)t->view)->drawtype == OB_SHADED) reshadeall_displist(t->scene); @@ -800,24 +778,6 @@ void postTrans (TransInfo *t) TransData *td; G.moving = 0; // Set moving flag off (display as usual) -#ifdef WITH_VERSE - - for (td = t->data; td < t->data + t->total; td++) { - if(td->flag & TD_VERSE_VERT) { - if(td->verse) send_versevert_pos((VerseVert*)td->verse); - } - else if(td->flag & TD_VERSE_OBJECT) { - if(td->verse) { - struct VNode *vnode; - vnode = (VNode*)((Object*)td->verse)->vnode; - ((VObjectData*)vnode->data)->flag |= POS_SEND_READY; - ((VObjectData*)vnode->data)->flag |= ROT_SEND_READY; - ((VObjectData*)vnode->data)->flag |= SCALE_SEND_READY; - b_verse_send_transformation((Object*)td->verse); - } - } - } -#endif stopConstraint(t); @@ -927,25 +887,6 @@ void restoreTransObjects(TransInfo *t) for (td = t->data; td < t->data + t->total; td++) { restoreElement(td); -#ifdef WITH_VERSE - /* position of vertexes and object transformation matrix is sent - * extra, becuase blender uses synchronous sending of vertexes - * position as well object trans. matrix and it isn't possible to - * send it in recalcData sometimes */ - if(td->flag & TD_VERSE_VERT) { - if(td->verse) { - ((VerseVert*)td->verse)->flag |= VERT_POS_OBSOLETE; - } - } - else if(td->flag & TD_VERSE_OBJECT) - if(td->verse) { - struct VNode *vnode; - vnode = (VNode*)((Object*)td->verse)->vnode; - ((VObjectData*)vnode->data)->flag |= POS_SEND_READY; - ((VObjectData*)vnode->data)->flag |= ROT_SEND_READY; - ((VObjectData*)vnode->data)->flag |= SCALE_SEND_READY; - } -#endif } Mat3One(t->mat); |