[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19002] branches/blender2.5/blender/source /blender/editors/transform: Record Transform Animation - Quicky feature which makes it super-easy to animat
Revision: 19002 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19002 Author: aligorith Date: 2009-02-17 09:55:50 +0100 (Tue, 17 Feb 2009) Log Message: --- Record Transform Animation - Quicky feature which makes it super-easy to animate stuff quickly To use, simply enable Auto-Keyframing and start the animation playback from the TimeLine. Then at any time while the playback is still running (and Auto-Keyframing is still enabled), select any object/bone and start moving it around. You can also select other objects/bones and move them around using standard transform tools (grab/rotate/scale), or exit transform for the active/selected object(s), and move on to other objects instead. Repeat until satisfactory! This is similar to the old 'Record IPO' functionality (and/or is closer to the 'Mouse Recording' in 3DSMax), except it's much cooler, and is more flexible at the same time. It's "good for quick and dirty tests, or things with timing, where it's easier to do it real time" - William Reynish, or "handycam effect or eyes animation" - Pepeland. Additional Notes: - for now, the objects that are used for this currently need some animation data already. This limitation is temporary. - eventually, 'samples' (i.e. baked-data) not keyframes will be made by this tool as samples are more suitable for such large sets of densely spaced points Modified Paths: -- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c === --- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c 2009-02-17 04:32:49 UTC (rev 19001) +++ branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c 2009-02-17 08:55:50 UTC (rev 19002) @@ -4203,7 +4203,7 @@ { ID *id= &ob->id; AnimData *adt= ob->adt; - bArmature *arm= ob->data; + //bArmature *arm= ob->data; bAction *act= (adt) ? adt->action : NULL; bPose *pose= ob->pose; bPoseChannel *pchan; Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c === --- branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-17 04:32:49 UTC (rev 19001) +++ branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-17 08:55:50 UTC (rev 19002) @@ -561,11 +561,15 @@ Object *ob= t->poseobj; bArmature *arm= ob->data; - /* if animtimer is running, check if the auto-record feature means that we should record 'samples' + /* if animtimer is running, and the object already has animation data, +* check if the auto-record feature means that we should record 'samples' * (i.e. uneditable animation values) */ - if (t->animtimer && IS_AUTOKEY_ON(t->scene)) { - // XXX + // XXX experimental feature + // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? + if ((ob->adt) && (t->animtimer) && IS_AUTOKEY_ON(t->scene)) { + short targetless_ik= 0; // XXX... + autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik); } /* old optimize trick... this enforces to bypass the depgraph */ @@ -584,24 +588,16 @@ ob->recalc |= OB_RECALC_OB; if(base->flag & BA_HAS_RECALC_DATA) ob->recalc |= OB_RECALC_DATA; - -#if 0 // XXX old animation system - /* thanks to ob->ctime usage, ipos are not called in where_is_object, - unless we edit ipokeys */ - if(base->flag & BA_DO_IPO) { - if(ob->ipo) { - IpoCurve *icu; - - ob->ctime= -1234567.0; - - icu= ob->ipo->curve.first; - while(icu) { - calchandles_ipocurve(icu); - icu= icu->next; - } - } + + /* if animtimer is running, and
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19003] branches/blender2.5/blender/source /blender/editors/transform: PoseChannel Transforms - AutoIK Restored
Revision: 19003 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19003 Author: aligorith Date: 2009-02-17 10:34:21 +0100 (Tue, 17 Feb 2009) Log Message: --- PoseChannel Transforms - AutoIK Restored - Auto-IK works again now. - Quick-animate feature works with Auto-IK now. - Also disabled the checks for existing animation data for this, making it easier to use/discover. At least we've got undo to cover for the cases where the user didn't intend to do this. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c === --- branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c 2009-02-17 08:55:50 UTC (rev 19002) +++ branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c 2009-02-17 09:34:21 UTC (rev 19003) @@ -125,6 +125,7 @@ #include "ED_image.h" #include "ED_keyframing.h" #include "ED_keyframes_edit.h" +#include "ED_object.h" #include "ED_mesh.h" #include "ED_types.h" #include "ED_uvedit.h" @@ -835,18 +836,17 @@ if(data->tar==NULL || (data->tar->type==OB_ARMATURE && data->subtarget[0]==0)) { targetless = con; /* but, if this is a targetless IK, we make it auto anyway (for the children loop) */ - if (con->enforce!=0.0) { + if (con->enforce!=0.0f) { targetless->flag |= CONSTRAINT_IK_AUTO; return 0; } } - if ((con->flag & CONSTRAINT_DISABLE)==0 && (con->enforce!=0.0)) + if ((con->flag & CONSTRAINT_DISABLE)==0 && (con->enforce!=0.0f)) return 0; } } - // TRANSFORM_FIX_ME - //con = add_new_constraint(CONSTRAINT_TYPE_KINEMATIC); + con = add_new_constraint(CONSTRAINT_TYPE_KINEMATIC); BLI_addtail(&pchan->constraints, con); pchan->constflag |= (PCHAN_HAS_IK|PCHAN_HAS_TARGET);/* for draw, but also for detecting while pose solving */ data= con->data; @@ -965,7 +965,6 @@ if (arm->flag & ARM_RESTPOS) { if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE)==0) { - //notice("Pose edit not possible while Rest Position is enabled"); BKE_report(CTX_reports(C), RPT_ERROR, "Can't select linked when sync selection is enabled."); return; } @@ -1004,7 +1003,6 @@ } if(td != (t->data+t->total)) { - // printf("Bone selection count error\n"); BKE_report(CTX_reports(C), RPT_DEBUG, "Bone selection count error."); } Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c === --- branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-17 08:55:50 UTC (rev 19002) +++ branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-17 09:34:21 UTC (rev 19003) @@ -565,10 +565,10 @@ * check if the auto-record feature means that we should record 'samples' * (i.e. uneditable animation values) */ - // XXX experimental feature // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? - if ((ob->adt) && (t->animtimer) && IS_AUTOKEY_ON(t->scene)) { - short targetless_ik= 0; // XXX... + // TODO: maybe the ob->adt check isn't really needed? makes it too difficult to use... + if (/*(ob->adt) && */(t->animtimer) && IS_AUTOKEY_ON(t->scene)) { + short targetless_ik= (t->flag & T_AUTOIK); autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik); } @@ -593,9 +593,9 @@ * check if the auto-record feature means that we should record 'samples' * (i.e. uneditable animation values) */ - // XXX experimental feature // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? - if ((ob->adt) && (t->animtimer) && IS_AUTOKEY_ON(t->scene)) { +
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19004] branches/blender2.5/blender/source /blender/editors: Visual Keyframing - Restored code to make this work, but it may still be flaky
Revision: 19004 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19004 Author: aligorith Date: 2009-02-17 11:58:40 +0100 (Tue, 17 Feb 2009) Log Message: --- Visual Keyframing - Restored code to make this work, but it may still be flaky NOTE: upon further testing, quick-record-animation feature does not work with auto-ik yet. Although it would be desireable to have, it is not a priority at this point, since adding that would require a bit of reworking of that code for something it wasn't intended for. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframing.c === --- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-02-17 09:34:21 UTC (rev 19003) +++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-02-17 10:58:40 UTC (rev 19004) @@ -527,37 +527,50 @@ */ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop) { - //Object *ob= NULL; bConstraint *con= NULL; short searchtype= VISUALKEY_NONE; + char *identifier= NULL; -#if 0 // XXX old animation system /* validate data */ - if ((id == NULL) || (GS(id->name)!=ID_OB) || !(ELEM(blocktype, ID_OB, ID_PO))) - return 0; - - /* get first constraint and determine type of keyframe constraints to check for*/ - ob= (Object *)id; - - if (blocktype == ID_OB) { + // TODO: this check is probably not needed, but it won't hurt + if (ELEM3(NULL, ptr, ptr->data, prop)) + return 0; + + /* get first constraint and determine type of keyframe constraints to check for +* - constraints can be on either Objects or PoseChannels, so we only check if the +*ptr->type is RNA_Object or RNA_PoseChannel, which are the RNA wrapping-info for +*those structs, allowing us to identify the owner of the data +*/ + if (ptr->type == &RNA_Object) { + /* Object */ + Object *ob= (Object *)ptr->data; + con= ob->constraints.first; + identifier= (char *)RNA_property_identifier(ptr, prop); + } + else if (ptr->type == &RNA_PoseChannel) { + /* Pose Channel */ + bPoseChannel *pchan= (bPoseChannel *)ptr->data; - if (ELEM3(adrcode, OB_LOC_X, OB_LOC_Y, OB_LOC_Z)) - searchtype= VISUALKEY_LOC; - else if (ELEM3(adrcode, OB_ROT_X, OB_ROT_Y, OB_ROT_Z)) - searchtype= VISUALKEY_ROT; + con= pchan->constraints.first; + identifier= (char *)RNA_property_identifier(ptr, prop); } - else if (blocktype == ID_PO) { - bPoseChannel *pchan= get_pose_channel(ob->pose, actname); - con= pchan->constraints.first; + + /* check if any data to search using */ + if (ELEM(NULL, con, identifier)) + return 0; - if (ELEM3(adrcode, AC_LOC_X, AC_LOC_Y, AC_LOC_Z)) - searchtype= VISUALKEY_LOC; - else if (ELEM4(adrcode, AC_QUAT_W, AC_QUAT_X, AC_QUAT_Y, AC_QUAT_Z)) - searchtype= VISUALKEY_ROT; + /* location or rotation identifiers only... */ + if (strstr(identifier, "location")) + searchtype= VISUALKEY_LOC; + else if (strstr(identifier, "rotation")) + searchtype= VISUALKEY_ROT; + else { + printf("visualkey_can_use() failed: identifier - '%s' \n", identifier); + return 0; } -#endif + /* only search if a searchtype and initial constraint are available */ if (searchtype && con) { for (; con; con= con->next) { @@ -617,52 +630,40 @@ * In the event that it is not possible to perform visual keying, try to fall-back * to using the default method. Assumes that all data it has been passed is valid. */ -// xxx... ptr here should be struct that data is in prop is the channel that's being used static float visualkey_get_value (PointerRNA *ptr, PropertyRNA *prop, int array_index) { -#if 0 // XXX old animation system - Object *ob; - void *poin = NULL; - int index, vartype; + char *identifier= (char *)RNA_property_identifier(ptr, prop); - /* validate situtation */ - if ((id==NULL) || (GS(id->name)!=ID_OB) || (ELEM(blocktype, ID_OB, ID_PO)==0)) -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19005] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 19005 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19005 Author: ton Date: 2009-02-17 14:11:09 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5 Small fixes for filewindow; - on resize area/window, the load button disappeared. - made scrollers indicate what direction works - mousewheel scroll switches to horizontal automatically now (assuming we keep filelists horiz, previews vertical scrolled) View2d got hacked a bit by me for it; i guess for some cases the scroll value should become customizable. Will come back later! Modified Paths: -- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c branches/blender2.5/blender/source/blender/editors/space_file/space_file.c Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c === --- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2009-02-17 10:58:40 UTC (rev 19004) +++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2009-02-17 13:11:09 UTC (rev 19005) @@ -367,9 +367,16 @@ return OPERATOR_PASS_THROUGH; } - /* set RNA-Props - only movement in positive x-direction */ - RNA_int_set(op->ptr, "deltax", 0); - RNA_int_set(op->ptr, "deltay", -20); + /* set RNA-Props */ + /* automatically fall back to horizontal on this exception: */ + if( ELEM(vpd->v2d->scroll, V2D_SCROLL_BOTTOM, V2D_SCROLL_TOP) ) { + RNA_int_set(op->ptr, "deltax", -20); + RNA_int_set(op->ptr, "deltay", 0); + } + else { + RNA_int_set(op->ptr, "deltax", 0); + RNA_int_set(op->ptr, "deltay", -20); + } /* apply movement, then we're done */ view_pan_apply(C, op); @@ -413,9 +420,16 @@ return OPERATOR_PASS_THROUGH; } - /* set RNA-Props - only movement in negative x-direction */ - RNA_int_set(op->ptr, "deltax", 0); - RNA_int_set(op->ptr, "deltay", 20); + /* set RNA-Props */ + /* automatically fall back to horizontal on this exception: */ + if( ELEM(vpd->v2d->scroll, V2D_SCROLL_BOTTOM, V2D_SCROLL_TOP) ) { + RNA_int_set(op->ptr, "deltax", 20); + RNA_int_set(op->ptr, "deltay", 0); + } + else { + RNA_int_set(op->ptr, "deltax", 0); + RNA_int_set(op->ptr, "deltay", 20); + } /* apply movement, then we're done */ view_pan_apply(C, op); Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c === --- branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c 2009-02-17 10:58:40 UTC (rev 19004) +++ branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c 2009-02-17 13:11:09 UTC (rev 19005) @@ -103,6 +103,7 @@ } } +/* note; this function uses pixelspace (0, 0, winx, winy), not view2d */ void file_draw_buttons(const bContext *C, ARegion *ar) { SpaceFile *sfile= (SpaceFile*)CTX_wm_space_data(C); @@ -118,14 +119,14 @@ int filebuty1, filebuty2; - float xmin = ar->v2d.mask.xmin + 10; - float xmax = ar->v2d.mask.xmax - 10; + float xmin = 10; + float xmax = ar->winx - 10; - filebuty1= ar->v2d.mask.ymax - IMASEL_BUTTONS_HEIGHT; + filebuty1= ar->winy - IMASEL_BUTTONS_HEIGHT; filebuty2= filebuty1+IMASEL_BUTTONS_HEIGHT/2 -6; /* HEADER */ - sprintf(name, "win %d", 1); // XXX sa-win??? + sprintf(name, "win %p", ar); block = uiBeginBlock(C, ar, name, UI_EMBOSS, UI_HELV); uiBlockSetHandleFunc(block, do_file_buttons, NULL); @@ -136,7 +137,7 @@ /* space available for load/save buttons? */ slen = UI_GetStringWidth(G.font, sfile->params->title, 0); loadbutton= slen > 60 ? slen + 20 : MAX2(80, 20+UI_GetStringWidth(G.font, params->title, 0)); - if(ar->v2d.cur.xmax-ar->v2d.cur.xmin > loadbutton+20) { + if(ar->winx > loadbutton+20) { if(params->title[0]==0) { loadbutton= 0; } Modified: branches/blender2.5/blender/source/blender/editors/space_file/space_file.c === --- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-02-17 10:58:40 UTC (rev 19004) +++ branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-02-17 13:11:09 UTC (rev 19005) @@ -128,35 +128,21 @@ } -/* spacetype; init callback */ +/* spacetype; init callback, area size changes, screen set, etc */ static void file_init(struct wmWindowManager *wm,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19006] branches/blender2.5/blender/source /blender: 2.5
Revision: 19006 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19006 Author: ton Date: 2009-02-17 14:37:06 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5 Node/Composite tinkering: - titles in headers and on collapsed nodes back - backdrop option draws again (no scroll operator yet) - added preview option in blur, filter and mix nodes. Just for fun while working :) Probably every node should get this... Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c branches/blender2.5/blender/source/blender/editors/space_node/node_intern.h branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_filter.c branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c Modified: branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c === --- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c 2009-02-17 13:11:09 UTC (rev 19005) +++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c 2009-02-17 13:37:06 UTC (rev 19006) @@ -2443,7 +2443,7 @@ #endif -void draw_nodespace_back_pix(ScrArea *sa, SpaceNode *snode) +void draw_nodespace_back_pix(ARegion *ar, SpaceNode *snode) { if((snode->flag & SNODE_BACKDRAW) && snode->treetype==NTREE_COMPOSIT) { @@ -2453,12 +2453,12 @@ float x, y; /* somehow the offset has to be calculated inverse */ - //glaDefine2DArea(&sa->winrct); + glaDefine2DArea(&ar->winrct); /* ortho at pixel level curarea */ - //myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375); + wmOrtho2(-0.375, ar->winx-0.375, -0.375, ar->winy-0.375); - x = (sa->winx-ibuf->x)/2 + snode->xof; - y = (sa->winy-ibuf->y)/2 + snode->yof; + x = (ar->winx-ibuf->x)/2 + snode->xof; + y = (ar->winy-ibuf->y)/2 + snode->yof; if(ibuf->rect) glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_UNSIGNED_BYTE, ibuf->rect); @@ -2466,9 +2466,8 @@ glaDrawPixelsSafe(x, y, ibuf->x, ibuf->y, ibuf->x, GL_RGBA, GL_FLOAT, ibuf->rect_float); /* sort this out, this should not be needed */ - //myortho2(snode->v2d.cur.xmin, snode->v2d.cur.xmax, snode->v2d.cur.ymin, snode->v2d.cur.ymax); - //bwin_clear_viewmat(sa->win); /* clear buttons view */ - // glLoadIdentity(); + wmOrtho2(ar->v2d.cur.xmin, ar->v2d.cur.xmax, ar->v2d.cur.ymin, ar->v2d.cur.ymax); + glLoadIdentity(); } } } Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c === --- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-17 13:11:09 UTC (rev 19005) +++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-17 13:37:06 UTC (rev 19006) @@ -94,7 +94,7 @@ extern void gl_round_box(int mode, float minx, float miny, float maxx, float maxy, float rad); extern void ui_draw_tria_icon(float x, float y, float aspect, char dir); -#if 0 // XXX + static void snode_drawstring(void *curfont, SpaceNode *snode, char *str, int okwidth) { char drawstr[NODE_MAXSTR]; @@ -118,8 +118,8 @@ } UI_DrawString(curfont, drawstr, 0); } -#endif + static void node_scaling_widget(int color_id, float aspect, float xmin, float ymin, float xmax, float ymax) { float dx; @@ -730,7 +730,7 @@ else UI_ThemeColor(TH_TEXT); - // ui_rasterpos_safe(rct->xmin+19.0f, rct->ymax-NODE_DY+5.0f, snode->aspect); + ui_rasterpos_safe(rct->xmin+19.0f, rct->ymax-NODE_DY+5.0f, snode->aspect); if(node->flag & NODE_MUTED) sprintf(showname, "[%s]", node->name); @@ -739,11 +739,7 @@ else BLI_strncpy(showname, node->name, 128); - block= uiBeginBlock(C, ar, "snode_drawstring_hack", UI_EMBOSSN, UI_HELV); - // snode_drawstring(block->curfont, snode, showname, (int)(iconofs - rct->xmin-18.0f)); - bt= uiDefBut(block, LABEL, 0, showname, (int)rct->xmin+19, (int)rct->ymax-NODE_DY+5, 100, 20, NULL, 0, 0, 0, 0, ""); - uiEndBlock(C, block); -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19007] trunk/blender/source/blender/ python/api2_2x/sceneRender.c: python api bugfix,
Revision: 19007 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19007 Author: campbellbarton Date: 2009-02-17 15:41:36 +0100 (Tue, 17 Feb 2009) Log Message: --- python api bugfix, forgot to remove the cast from short to long when making x,y aspect floats. Modified Paths: -- trunk/blender/source/blender/python/api2_2x/sceneRender.c Modified: trunk/blender/source/blender/python/api2_2x/sceneRender.c === --- trunk/blender/source/blender/python/api2_2x/sceneRender.c 2009-02-17 13:37:06 UTC (rev 19006) +++ trunk/blender/source/blender/python/api2_2x/sceneRender.c 2009-02-17 14:41:36 UTC (rev 19007) @@ -1889,10 +1889,10 @@ param = self->renderContext->bake_biasdist; break; case EXPP_RENDER_ATTR_ASPECTX: - param = (long)self->renderContext->xasp; + param = self->renderContext->xasp; break; case EXPP_RENDER_ATTR_ASPECTY: - param = (long)self->renderContext->yasp; + param = self->renderContext->yasp; break; default: return EXPP_ReturnPyObjError( PyExc_RuntimeError, ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19008] branches/blender2.5/blender/source /blender/editors/interface/interface_utils.c: 2.5
Revision: 19008 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19008 Author: ton Date: 2009-02-17 15:56:07 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5 Bugfix: passing on uninitialized var to a function made msvc halt. Strange that gcc didnt complain :) Brecht: check if this 'a' was needed as counter or so? Modified Paths: -- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 14:41:36 UTC (rev 19007) +++ branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 14:56:07 UTC (rev 19008) @@ -387,7 +387,7 @@ else name= ""; - uiDefAutoButR(block, ptr, prop, a, name, x+DEF_BUT_WIDTH, y, DEF_BUT_WIDTH, DEF_BUT_HEIGHT-1); + uiDefAutoButR(block, ptr, prop, 0, name, x+DEF_BUT_WIDTH, y, DEF_BUT_WIDTH, DEF_BUT_HEIGHT-1); y -= DEF_BUT_HEIGHT; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19009] branches/blender2.5/blender/source /blender: 2.5
Revision: 19009 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19009 Author: ton Date: 2009-02-17 16:53:52 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5 Fix for the 'repeat last operator' option. It didn't work yet well outside editmode. Now undo/redo has to fully keep the UI alive, even when called from within a running popup. Another fix: when regions collapse/hide they were not effectively disabled, still accepting events. (like Nkey in 3d window). Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c branches/blender2.5/blender/source/blender/editors/interface/interface.c branches/blender2.5/blender/source/blender/editors/screen/area.c branches/blender2.5/blender/source/blender/editors/transform/transform.c Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c === --- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2009-02-17 14:56:07 UTC (rev 19008) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2009-02-17 15:53:52 UTC (rev 19009) @@ -321,10 +321,6 @@ G.main= bfd->main; CTX_data_main_set(C, G.main); - CTX_wm_screen_set(C, NULL); - CTX_wm_area_set(C, NULL); - CTX_wm_region_set(C, NULL); - CTX_wm_ui_block_set(C, NULL, NULL); if (bfd->user) { @@ -340,15 +336,19 @@ /* case G_FILE_NO_UI or no screens in file */ if(mode) { - CTX_wm_screen_set(C, curscreen); + /* leave entire context further unaltered? */ CTX_data_scene_set(C, curscene); } else { G.winpos= bfd->winpos; G.displaymode= bfd->displaymode; G.fileflags= bfd->fileflags; + CTX_wm_screen_set(C, bfd->curscreen); CTX_data_scene_set(C, bfd->curscreen->scene); + CTX_wm_area_set(C, NULL); + CTX_wm_region_set(C, NULL); + CTX_wm_ui_block_set(C, NULL, NULL); } /* this can happen when active scene was lib-linked, and doesnt exist anymore */ @@ -372,8 +372,9 @@ //setscreen(G.curscreen); } - // XXX is this in the right place? - do_versions_ipos_to_animato(G.main); // XXX fixme... complicated versionpatching + // XXX temporarily here + if(G.main->versionfile < 250) + do_versions_ipos_to_animato(G.main); // XXX fixme... complicated versionpatching /* baseflags, groups, make depsgraph, etc */ set_scene_bg(CTX_data_scene(C)); Modified: branches/blender2.5/blender/source/blender/editors/interface/interface.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface.c 2009-02-17 14:56:07 UTC (rev 19008) +++ branches/blender2.5/blender/source/blender/editors/interface/interface.c 2009-02-17 15:53:52 UTC (rev 19009) @@ -1494,6 +1494,7 @@ } } +/* can be called with C==NULL */ static void ui_free_but(const bContext *C, uiBut *but) { if(but->opptr) { @@ -1501,13 +1502,21 @@ MEM_freeN(but->opptr); } if(but->func_argN) MEM_freeN(but->func_argN); - if(but->active) ui_button_active_cancel(C, but); + if(but->active) { + /* XXX solve later, buttons should be free-able without context? */ + if(C) + ui_button_active_cancel(C, but); + else + if(but->active) + MEM_freeN(but->active); + } if(but->str && but->str != but->strdata) MEM_freeN(but->str); ui_free_link(but->link); MEM_freeN(but); } +/* can be called with C==NULL */ void uiFreeBlock(const bContext *C, uiBlock *block) { uiBut *but; @@ -1525,6 +1534,7 @@ MEM_freeN(block); } +/* can be called with C==NULL */ void uiFreeBlocks(const bContext *C, ListBase *lb) { uiBlock *block; Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c === --- branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-02-17 14:56:07 UTC (rev 19008) +++ branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-02-17 15:53:52 UTC (rev 19009) @@ -330,6 +330,8 @@ if(ar==NULL) return; + BLI_init_rcti(&ar->winrct, 0, 0, 0, 0); + /* clear state flags first */ ar->flag &= ~RGN_FLAG_TOO_SMALL; /* user errors */ @@ -603,11 +605,17 @@ for(ar= sa->regionbase.first; ar; ar= ar->next) { region_subwindow(wm, win, ar);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19010] branches/blender2.5/blender/source /blender/editors/space_file/space_file.c: 2.5
Revision: 19010 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19010 Author: ton Date: 2009-02-17 17:33:08 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5 Bug: cleanup in space_file copy I did missed a NULL check :) Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c Modified: branches/blender2.5/blender/source/blender/editors/space_file/space_file.c === --- branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-02-17 15:53:52 UTC (rev 19009) +++ branches/blender2.5/blender/source/blender/editors/space_file/space_file.c 2009-02-17 16:33:08 UTC (rev 19010) @@ -142,12 +142,14 @@ /* clear or remove stuff from old */ sfilen->op = NULL; /* file window doesn't own operators */ - sfilen->params= MEM_dupallocN(sfileo->params); + sfilen->files = filelist_new(); - sfilen->files = filelist_new(); - filelist_setdir(sfilen->files, sfilen->params->dir); - filelist_settype(sfilen->files, sfilen->params->type); - + if(sfileo->params) { + sfilen->params= MEM_dupallocN(sfileo->params); + + filelist_setdir(sfilen->files, sfilen->params->dir); + filelist_settype(sfilen->files, sfilen->params->type); + } return (SpaceLink *)sfilen; } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19011] branches/blender2.5/blender/source /blender: Making the things compiled!!
Revision: 19011 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19011 Author: bdiego Date: 2009-02-17 17:56:29 +0100 (Tue, 17 Feb 2009) Log Message: --- Making the things compiled!! I change the #if 0 with #if WITH_FREETYPE2, also fix a lot of typos, etc. This is the basic but now it draw text!!, I am using the "User Preference" space to test the library, nobody is working on that and the option are in the outliner now so... TODO-next: using the 4x4 mat, string size, bounding box, aspect and rotate. Notes: I update the Makefile, missing some include and other things so maybe scons, cmake and msvc also need update ? Modified Paths: -- branches/blender2.5/blender/source/blender/blenfont/BLF_api.h branches/blender2.5/blender/source/blender/blenfont/intern/Makefile branches/blender2.5/blender/source/blender/blenfont/intern/blf.c branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c branches/blender2.5/blender/source/blender/blenfont/intern/blf_glyph.c branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal.h branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal_types.h branches/blender2.5/blender/source/blender/blenfont/intern/blf_lang.c branches/blender2.5/blender/source/blender/editors/interface/text.c branches/blender2.5/blender/source/blender/editors/space_info/Makefile branches/blender2.5/blender/source/blender/editors/space_info/space_info.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c Modified: branches/blender2.5/blender/source/blender/blenfont/BLF_api.h === --- branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-02-17 16:33:08 UTC (rev 19010) +++ branches/blender2.5/blender/source/blender/blenfont/BLF_api.h 2009-02-17 16:56:29 UTC (rev 19011) @@ -29,6 +29,18 @@ #ifndef BLF_API_H #define BLF_API_H +int BLF_init(void); +void BLF_exit(void); + +int BLF_load(char *name); +int BLF_load_mem(char *name, unsigned char *mem, int mem_size); + +void BLF_set(int fontid); +void BLF_aspect(float aspect); +void BLF_position(float x, float y, float z); +void BLF_size(int size, int dpi); +void BLF_draw(char *str); + /* Read the .Blanguages file, return 1 on success or 0 if fails. */ int BLF_lang_init(void); @@ -49,8 +61,6 @@ /* Return the code string for the specified language code. */ char *BLF_lang_find_code(short langid); -#if 0 - /* Add a path to the font dir paths. */ void BLF_dir_add(const char *path); @@ -63,6 +73,4 @@ /* Free the data return by BLF_dir_get. */ void BLF_dir_free(char **dirs, int count); -#endif /* zero!! */ - #endif /* BLF_API_H */ Modified: branches/blender2.5/blender/source/blender/blenfont/intern/Makefile === --- branches/blender2.5/blender/source/blender/blenfont/intern/Makefile 2009-02-17 16:33:08 UTC (rev 19010) +++ branches/blender2.5/blender/source/blender/blenfont/intern/Makefile 2009-02-17 16:56:29 UTC (rev 19011) @@ -33,10 +33,46 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +# OpenGL and Freetype2 +CPPFLAGS += -I$(NAN_GLEW)/include +CPPFLAGS += $(OGL_CPPFLAGS) +CPPFLAGS += -I$(NAN_FREETYPE)/include + +ifeq ($(OS), windows) + CPPFLAGS += -I$(NAN_ICONV)/include + ifeq ($(FREE_WINDOWS), true) +CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 +CPPFLAGS += -DUSE_GETTEXT_DLL + endif +else + CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 +endif + +ifeq ($(OS),linux) +ifeq ($(CPU),alpha) + CPPFLAGS += -I$(NAN_MESA)/include +endif +ifeq ($(CPU),i386) + CPPFLAGS += -I$(NAN_MESA)/include +endif +ifeq ($(CPU),powerpc) + CPPFLAGS += -I/usr/src/MesaCVS/include +endif +endif + +ifeq ($(WITH_FREETYPE2), true) +CPPFLAGS += -DWITH_FREETYPE2 +endif + +# Modules +CPPFLAGS += -I../../editors/include CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../blenkernel CPPFLAGS += -I../../ftfont +# Memory allocator +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include + +# Our own headers CPPFLAGS += -I.. Modified: branches/blender2.5/blender/source/blender/blenfont/intern/blf.c === --- branches/blender2.5/blender/source/blender/blenfont/intern/blf.c 2009-02-17 16:33:08 UTC (rev 19010) +++ branches/blender2.5/blender/source/blender/blenfont/intern/blf.c 2009-02-17 16:56:29 UTC (rev 19011) @@ -26,20 +26,23 @@ * * END GPL LICENSE BLOCK * */ -#if 0 - #include #include #include +#ifdef WITH_FREETYPE2 + #include #include FT_FREETYPE_H #include FT_GLYPH_H +#endi
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19012] branches/blender2.5/blender/source /blender: Fix scons build for blenfont, patch by skejoe.
Revision: 19012 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19012 Author: bdiego Date: 2009-02-17 20:09:14 +0100 (Tue, 17 Feb 2009) Log Message: --- Fix scons build for blenfont, patch by skejoe. Modified Paths: -- branches/blender2.5/blender/source/blender/blenfont/SConscript branches/blender2.5/blender/source/blender/editors/space_info/SConscript Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript === --- branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 16:56:29 UTC (rev 19011) +++ branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:09:14 UTC (rev 19012) @@ -4,7 +4,7 @@ sources = env.Glob('intern/*.c') -incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont' +incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../../editors/include' defs = '' Modified: branches/blender2.5/blender/source/blender/editors/space_info/SConscript === --- branches/blender2.5/blender/source/blender/editors/space_info/SConscript 2009-02-17 16:56:29 UTC (rev 19011) +++ branches/blender2.5/blender/source/blender/editors/space_info/SConscript 2009-02-17 19:09:14 UTC (rev 19012) @@ -3,7 +3,7 @@ sources = env.Glob('*.c') -incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' +incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf ../../blenfont' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), [], libtype=['core'], priority=[70] ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19013] branches/blender2.5/blender/source /blender/blenfont/SConscript: 2.5: fix to make blenfont module compile with scons.
Revision: 19013 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19013 Author: blendix Date: 2009-02-17 20:37:47 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5: fix to make blenfont module compile with scons. Modified Paths: -- branches/blender2.5/blender/source/blender/blenfont/SConscript Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript === --- branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:09:14 UTC (rev 19012) +++ branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:37:47 UTC (rev 19013) @@ -4,7 +4,10 @@ sources = env.Glob('intern/*.c') -incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../../editors/include' +incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../editors/include' +incs += ' ' + env['BF_FTGL_INC'] +incs += ' ' + env['BF_FREETYPE_INC'] +incs += ' ' + env['BF_GETTEXT_INC'] defs = '' ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19014] branches/blender2.5/blender/source /blender: 2.5: Text edit mode operators back.
Revision: 19014 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19014 Author: blendix Date: 2009-02-17 20:55:20 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5: Text edit mode operators back. Took me a while getting them nicely repeatable, and splitting up the big edit_text operator into individual operator so it's all nicely scriptable, documented, configurable, etc.. * Insert Text, Line Break, Insert Lorem * Toggle Case, Set Case, Toggle Style, Set Style, Set Material * Copy Text, Cut Text, Paste Text, Paste File, Paste Buffer * Move, Move Select, Delete * Change Spacing, Change Character Notes * Text (datablock) to Object doesn't work yet, will need to implement text editor context for that. * Some shortcut keys don't work because screen/wm overrides them, ctrl+x, ctrl+left/right. That override goes top down which works well for some cases, but here we need to override in the other direction. * There's no unicode support in RNA, or the user interface code for that matter, but text strings can contain these characters. At the moment it stores a UTF-8 string in char arrays, which is supposed to be nicely compatible with ascii. Seems reasonable to add support for UTF-8 in the interface code, python bindings, .. eventually? Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/intern/font.c branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c branches/blender2.5/blender/source/blender/editors/curve/editcurve.c branches/blender2.5/blender/source/blender/editors/curve/editfont.c branches/blender2.5/blender/source/blender/editors/include/ED_curve.h branches/blender2.5/blender/source/blender/editors/include/ED_screen.h branches/blender2.5/blender/source/blender/editors/include/UI_interface.h branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c branches/blender2.5/blender/source/blender/editors/object/object_edit.c branches/blender2.5/blender/source/blender/editors/object/object_intern.h branches/blender2.5/blender/source/blender/editors/object/object_ops.c branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/font.c === --- branches/blender2.5/blender/source/blender/blenkernel/intern/font.c 2009-02-17 19:37:47 UTC (rev 19013) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/font.c 2009-02-17 19:55:20 UTC (rev 19014) @@ -658,7 +658,7 @@ VChar *che; struct chartrans *chartransdata=NULL, *ct; float *f, xof, yof, xtrax, linedist, *linedata, *linedata2, *linedata3, *linedata4; - float twidth; + float twidth, maxlen= 0; int i, slen, j; int curbox; int selstart, selend; @@ -826,8 +826,6 @@ } } if(ascii== '\n' || ascii== '\r' || ascii==0 || ct->dobreak) { - float maxlen; - ct->xof= xof; ct->yof= yof; ct->linenr= lnr; Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h === --- branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-02-17 19:37:47 UTC (rev 19013) +++ branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-02-17 19:55:20 UTC (rev 19014) @@ -36,29 +36,57 @@ char *ED_lorem; /* editfont.c */ -void FONT_OT_textedit(struct wmOperatorType *ot); +enum { DEL_ALL, DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL }; +enum { CASE_LOWER, CASE_UPPER }; +enum { LINE_BEGIN, LINE_END, PREV_CHAR, NEXT_CHAR, PREV_WORD, NEXT_WORD, + PREV_LINE, NEXT_LINE, PREV_PAGE, NEXT_PAGE }; +void FONT_OT_insert_text(struct wmOperatorType *ot); +void FONT_OT_line_break(struct wmOperatorType *ot); +void FONT_OT_insert_lorem(struct wmOperatorType *ot); +void FONT_OT_text_to_object(struct wmOperatorType *ot); + +void FONT_OT_toggle_case(struct wmOperatorType *ot); +void FONT_OT_set_case(struct wmOperatorType *ot); +void FONT_OT_toggle_style(struct wmOperatorType *ot); +void FONT_OT_set_style(struct wmOperatorType *ot); +void FONT_OT_set_material(struct wmOperatorType *ot); + +void FONT_OT_copy_text(struct wmOperatorType *ot); +void FONT_OT_cut_text(struct wmOperatorType *ot); +void FONT_OT_paste_text(struct wmOperatorType *ot); +void FONT_OT_paste_file(struct wmOperatorType *ot); +void FONT_OT_paste_buffer(struct wmOperatorType *ot); + +void FONT_OT_move(struct wmOperatorType *ot); +void FONT_OT_mo
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19015] branches/blender2.5/blender/source /blender/blenfont/SConscript: And another scons fix, hope now work!!
Revision: 19015 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19015 Author: bdiego Date: 2009-02-17 20:57:05 +0100 (Tue, 17 Feb 2009) Log Message: --- And another scons fix, hope now work!! Modified Paths: -- branches/blender2.5/blender/source/blender/blenfont/SConscript Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript === --- branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:55:20 UTC (rev 19014) +++ branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:57:05 UTC (rev 19015) @@ -5,6 +5,7 @@ sources = env.Glob('intern/*.c') incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../editors/include' +incs += ' #/extern/glew/include' incs += ' ' + env['BF_FTGL_INC'] incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19016] branches/blender2.5/blender/source /blender/blenfont: 2.5: CMake update for blenfont module, also some flags for scons
Revision: 19016 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19016 Author: blendix Date: 2009-02-17 21:16:09 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5: CMake update for blenfont module, also some flags for scons to make it compatible with makefiles and ftfont module. Modified Paths: -- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt branches/blender2.5/blender/source/blender/blenfont/SConscript Modified: branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt === --- branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt 2009-02-17 19:57:05 UTC (rev 19015) +++ branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt 2009-02-17 20:16:09 UTC (rev 19016) @@ -24,15 +24,23 @@ FILE(GLOB SRC intern/*.c) -#SET(INC . intern ../../../intern/guardedalloc ../blenlib ../blenkernel ../makedna - SET(INC - ../../../intern/guardedalloc ../blenlib ../makesdna - ../blenkernel ../ftfont + ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include + ../blenkernel ../ftfont ../../../extern/glew/include + ${FTGL_INC} + ${FREETYPE_INC} + ${GETTEXT_INC} ) +ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC) + IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) -BLENDERLIB(bf_blenfont "${SRC}" "${INC}") \ No newline at end of file +IF(WIN32) + ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL) +ENDIF(WIN32) + +BLENDERLIB(bf_blenfont "${SRC}" "${INC}") + Modified: branches/blender2.5/blender/source/blender/blenfont/SConscript === --- branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 19:57:05 UTC (rev 19015) +++ branches/blender2.5/blender/source/blender/blenfont/SConscript 2009-02-17 20:16:09 UTC (rev 19016) @@ -15,4 +15,8 @@ if env['WITH_BF_INTERNATIONAL']: defs += ' WITH_FREETYPE2' +defs = 'FTGL_STATIC_LIBRARY' +if sys.platform == 'win32': + defs += ' _WIN32 USE_GETTEXT_DLL' + env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19017] branches/blender2.5/blender/source /blender/editors: 2.5: Image space, two fixes:
Revision: 19017 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19017 Author: blendix Date: 2009-02-17 21:37:23 +0100 (Tue, 17 Feb 2009) Log Message: --- 2.5: Image space, two fixes: * With one item in ID databrowse list, you couldn't activate it. * Render result without render image now displays grid at size according to render settings again. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c branches/blender2.5/blender/source/blender/editors/space_image/space_image.c Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 20:16:09 UTC (rev 19016) +++ branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 20:37:23 UTC (rev 19017) @@ -440,7 +440,7 @@ for(idtest=lb->first, nr=1; idtest; idtest=idtest->next, nr++) { if(nr==params->browsenr) { - if(id == idtest) + if(*id_p == idtest) return; *id_p= idtest; @@ -1128,7 +1128,5 @@ uiDefBut(block, BUT_CURVE, event, "", rect->xmin, rect->ymin, rect->xmax-rect->xmin, fy-rect->ymin, cumap, 0.0f, 1.0f, 0, 0, ""); - } - Modified: branches/blender2.5/blender/source/blender/editors/space_image/space_image.c === --- branches/blender2.5/blender/source/blender/editors/space_image/space_image.c 2009-02-17 20:16:09 UTC (rev 19016) +++ branches/blender2.5/blender/source/blender/editors/space_image/space_image.c 2009-02-17 20:37:23 UTC (rev 19017) @@ -276,33 +276,33 @@ /** main region ***/ /* sets up the fields of the View2D from zoom and offset */ -static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar) +static void image_main_area_set_view2d(SpaceImage *sima, ARegion *ar, Scene *scene) { Image *ima= ED_space_image(sima); float x1, y1, w, h; int width, height, winx, winy; + ED_space_image_size(sima, &width, &height); + #if 0 - if(image_preview_active(curarea, &xim, &yim)); - else if(sima->image) { + if(image_preview_active(curarea, &width, &height)); +#endif + if(sima->image) { ImBuf *ibuf= ED_space_image_buffer(sima); float xuser_asp, yuser_asp; ED_image_aspect(sima->image, &xuser_asp, &yuser_asp); if(ibuf) { - xim= ibuf->x * xuser_asp; - yim= ibuf->y * yuser_asp; + width= ibuf->x * xuser_asp; + width= ibuf->y * yuser_asp; } else if( sima->image->type==IMA_TYPE_R_RESULT ) { /* not very important, just nice */ - xim= (G.scene->r.xsch*G.scene->r.size)/100; - yim= (G.scene->r.ysch*G.scene->r.size)/100; + width= (scene->r.xsch*scene->r.size)/100; + height= (scene->r.ysch*scene->r.size)/100; } } -#endif - ED_space_image_size(sima, &width, &height); - w= width; h= height; @@ -373,7 +373,7 @@ glClear(GL_COLOR_BUFFER_BIT); /* we set view2d from own zoom and offset each time */ - image_main_area_set_view2d(sima, ar); + image_main_area_set_view2d(sima, ar, scene); /* we draw image in pixelspace */ draw_image_main(sima, ar, scene); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19018] branches/blender2.5/blender/source /blender: RNA:
Revision: 19018 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19018 Author: blendix Date: 2009-02-17 22:07:01 +0100 (Tue, 17 Feb 2009) Log Message: --- RNA: * Added Particle wrapping patch by Roelf de Kock. It's not complete yet and I haven't reviewed it, but committing anyway, will get to it later. * Added "Percentage" subtype for floats. Doesn't really do much besides making auto rna buttons into sliders rather than numeric inputs, but can later display in % rather than 0.0-1.0. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c branches/blender2.5/blender/source/blender/editors/object/object_edit.c branches/blender2.5/blender/source/blender/editors/space_image/space_image.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c branches/blender2.5/blender/source/blender/makesrna/RNA_define.h branches/blender2.5/blender/source/blender/makesrna/RNA_types.h branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c Modified: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c === --- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-02-17 20:37:23 UTC (rev 19017) +++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-02-17 21:07:01 UTC (rev 19018) @@ -1077,7 +1077,7 @@ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f); + RNA_def_float_percentage(ot->srna, "weight", 1.0f, 0.0f, 1.0f, "Weight", "", 0.0f, 1.0f); } /*** set radius operator **/ @@ -4195,7 +4195,7 @@ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - RNA_def_float(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of vertices to select randomly.", 0.0001f, 1.0f); + RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of vertices to select randomly.", 0.0001f, 1.0f); } /** select every nth */ Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 20:37:23 UTC (rev 19017) +++ branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-17 21:07:01 UTC (rev 19018) @@ -249,6 +249,8 @@ if(RNA_property_subtype(ptr, prop) == PROP_COLOR) but= uiDefButR(block, COL, 0, name, x1, y1, x2, y2, ptr, propname, 0, 0, 0, -1, -1, NULL); } + else if(RNA_property_subtype(ptr, prop) == PROP_PERCENTAGE) + but= uiDefButR(block, NUMSLI, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL); else but= uiDefButR(block, NUM, 0, name, x1, y1, x2, y2, ptr, propname, index, 0, 0, -1, -1, NULL); break; Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c === --- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c 2009-02-17 20:37:23 UTC (rev 19017) +++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c 2009-02-17 21:07:01 UTC (rev 19018) @@ -3448,10 +3448,10 @@ ot->poll= ED_operator_editmesh; /* flags */ - ot->flag= OPTYPE_REGISTER/*|OPTYPE_UNDO*/; + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_float(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of vertices to select randomly.", 0.0001f, 1.0f); + RNA_def_float_percentage(ot->srna, "percent", 0.5f, 0.0f, 1.0f, "Percent", "Percentage of vertices to select randomly.", 0.0001f, 1.0f); } void editmesh_select_by_material(EditMesh *em, int index) Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c ===
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19019] branches/blender2.5/blender/source /blender/editors/armature: 2.5
Revision: 19019 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19019 Author: mfoxdogg Date: 2009-02-18 02:50:26 +0100 (Wed, 18 Feb 2009) Log Message: --- 2.5 ** added a ARMATURE_OT_bone_add operator, ita generic operator to add a bone it behaves the same way as the old add bone (making a bone not set the tail but have it selected), commiting this so other add bone ops like add bonre pinative or making new armature Modified Paths: -- branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c branches/blender2.5/blender/source/blender/editors/armature/editarmature.c Modified: branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h === --- branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h 2009-02-17 21:07:01 UTC (rev 19018) +++ branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h 2009-02-18 01:50:26 UTC (rev 19019) @@ -32,7 +32,7 @@ struct wmOperatorType; /* editarmature.c */ - +void ARMATURE_OT_bone_add(struct wmOperatorType *ot); void ARMATURE_OT_align_bones(struct wmOperatorType *ot); void ARMATURE_OT_calculate_roll(struct wmOperatorType *ot); void ARMATURE_OT_switch_direction(struct wmOperatorType *ot); Modified: branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c === --- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-17 21:07:01 UTC (rev 19018) +++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-18 01:50:26 UTC (rev 19019) @@ -108,6 +108,8 @@ void ED_operatortypes_armature(void) { /* EDIT ARMATURE */ + WM_operatortype_append(ARMATURE_OT_bone_add); + WM_operatortype_append(ARMATURE_OT_align_bones); WM_operatortype_append(ARMATURE_OT_calculate_roll); WM_operatortype_append(ARMATURE_OT_switch_direction); Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c === --- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-17 21:07:01 UTC (rev 19018) +++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-18 01:50:26 UTC (rev 19019) @@ -2977,7 +2977,61 @@ // Transform(); } +/* ** Bone Add / +/*op makes a new bone and returns it with its tip selected */ + +static int armature_bone_add_exec(bContext *C, wmOperator *op) +{ + Object *ob= CTX_data_edit_object(C); + bArmature *arm= (bArmature *)ob->data; + EditBone *bone= MEM_callocN(sizeof(EditBone), "eBone"); + char name[32]; + + RNA_string_get(op->ptr, "name", name); + + BLI_strncpy(bone->name, name, 32); + unique_editbone_name(arm->edbo, bone->name); + + BLI_addtail(arm->edbo, bone); + + bone->flag |= BONE_TIPSEL; + bone->weight= 1.0f; + bone->dist= 0.25f; + bone->xwidth= 0.1f; + bone->zwidth= 0.1f; + bone->ease1= 1.0f; + bone->ease2= 1.0f; + bone->rad_head= 0.10f; + bone->rad_tail= 0.05f; + bone->segments= 1; + bone->layer= arm->layer; + + armature_sync_selection(arm->edbo); + + WM_event_add_notifier(C, NC_OBJECT, ob); + + return OPERATOR_FINISHED; +} + +void ARMATURE_OT_bone_add(wmOperatorType *ot) +{ + /* identifiers */ + ot->name= "Add Bone"; + ot->idname= "ARMATURE_OT_bone_add"; + + /* api callbacks */ + ot->exec = armature_bone_add_exec; + ot->poll = ED_operator_editarmature; + + /* flags */ + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + + RNA_def_string(ot->srna, "name", "Bone", 32, "Name", "Name of the newly created bone"); + +} + + /* --- */ /* Subdivide Operators: ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19020] branches/blender2.5/blender/source /blender/editors/armature: 2.5
Revision: 19020 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19020 Author: mfoxdogg Date: 2009-02-18 03:13:36 +0100 (Wed, 18 Feb 2009) Log Message: --- 2.5 * added add_primitive_bone, removed operator from previous commit as it was not needed Modified Paths: -- branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c branches/blender2.5/blender/source/blender/editors/armature/editarmature.c Modified: branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h === --- branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h 2009-02-18 01:50:26 UTC (rev 19019) +++ branches/blender2.5/blender/source/blender/editors/armature/armature_intern.h 2009-02-18 02:13:36 UTC (rev 19020) @@ -32,7 +32,7 @@ struct wmOperatorType; /* editarmature.c */ -void ARMATURE_OT_bone_add(struct wmOperatorType *ot); +void ARMATURE_OT_bone_primitive_add(struct wmOperatorType *ot); void ARMATURE_OT_align_bones(struct wmOperatorType *ot); void ARMATURE_OT_calculate_roll(struct wmOperatorType *ot); void ARMATURE_OT_switch_direction(struct wmOperatorType *ot); Modified: branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c === --- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-18 01:50:26 UTC (rev 19019) +++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-18 02:13:36 UTC (rev 19020) @@ -108,7 +108,7 @@ void ED_operatortypes_armature(void) { /* EDIT ARMATURE */ - WM_operatortype_append(ARMATURE_OT_bone_add); + WM_operatortype_append(ARMATURE_OT_bone_primitive_add); WM_operatortype_append(ARMATURE_OT_align_bones); WM_operatortype_append(ARMATURE_OT_calculate_roll); Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c === --- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-18 01:50:26 UTC (rev 19019) +++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-18 02:13:36 UTC (rev 19020) @@ -2981,47 +2981,56 @@ /*op makes a new bone and returns it with its tip selected */ -static int armature_bone_add_exec(bContext *C, wmOperator *op) +static int armature_bone_primitive_add_exec(bContext *C, wmOperator *op) { - Object *ob= CTX_data_edit_object(C); - bArmature *arm= (bArmature *)ob->data; - EditBone *bone= MEM_callocN(sizeof(EditBone), "eBone"); + RegionView3D *rv3d= CTX_wm_region_view3d(C); + Object *obedit = CTX_data_edit_object(C); + bArmature *arm= (bArmature *)obedit->data; + EditBone *bone; + float obmat[3][3], curs[3], viewmat[3][3], totmat[3][3], imat[3][3]; char name[32]; - + RNA_string_get(op->ptr, "name", name); + + VECCOPY(curs, give_cursor(CTX_data_scene(C),CTX_wm_view3d(C))); - BLI_strncpy(bone->name, name, 32); - unique_editbone_name(arm->edbo, bone->name); + /* Get inverse point for head and orientation for tail */ + Mat4Invert(obedit->imat, obedit->obmat); + Mat4MulVecfl(obedit->imat, curs); + + if (U.flag & USER_ADD_VIEWALIGNED) + Mat3CpyMat4(obmat, rv3d->viewmat); + else Mat3One(obmat); - BLI_addtail(arm->edbo, bone); + Mat3CpyMat4(viewmat, obedit->obmat); + Mat3MulMat3(totmat, obmat, viewmat); + Mat3Inv(imat, totmat); - bone->flag |= BONE_TIPSEL; - bone->weight= 1.0f; - bone->dist= 0.25f; - bone->xwidth= 0.1f; - bone->zwidth= 0.1f; - bone->ease1= 1.0f; - bone->ease2= 1.0f; - bone->rad_head= 0.10f; - bone->rad_tail= 0.05f; - bone->segments= 1; - bone->layer= arm->layer; + deselectall_armature(obedit, 0, 0); - armature_sync_selection(arm->edbo); + /* Create a bone */ + bone= add_editbone(obedit, name); - WM_event_add_notifier(C, NC_OBJECT, ob); + VECCOPY(bone->head, curs); + if(U.flag & USER_ADD_VIEWALIGNED) + VecAddf(bone->tail, bone->head, imat[1]); // bone with unit length 1 + else + VecAddf(bone->tail, bone->head, imat[2]); // bone with unit length 1, pointing up Z + + WM_event_add_notifier(C, NC_OBJECT, obedit); + return OPERATOR_FINISHED; } -void ARMATURE_OT_bone_add(wmOperatorType *ot) +void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) { /* identifiers */ ot->name= "Add Bone"; - ot->idname= "ARMATURE_OT_b
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19021] branches/blender2.5/blender/source /blender/editors/mesh: working yet preliminary (like everything) screw mesh .
Revision: 19021 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19021 Author: shul Date: 2009-02-18 04:01:45 +0100 (Wed, 18 Feb 2009) Log Message: --- working yet preliminary (like everything) screw mesh. in irc there was a discussion about setting the screw axis outside of the function, but someone else should do that. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c === --- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-18 02:13:36 UTC (rev 19020) +++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-18 03:01:45 UTC (rev 19021) @@ -819,17 +819,13 @@ RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, INT_MAX); } -void spin_mesh(bContext *C, wmOperator *op,float *dvec ) +void spin_mesh(bContext *C, wmOperator *op,float *dvec,int steps, float degr,int mode ) { Object *obedit= CTX_data_edit_object(C); View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); EditMesh *em= ((Mesh *)obedit->data)->edit_mesh; - int steps = RNA_int_get(op->ptr,"steps"); - float degr = RNA_float_get(op->ptr,"degrees"); - int mode = RNA_int_get(op->ptr,"steps"); - RegionView3D *rv3d= CTX_wm_region_view3d(C); EditVert *eve,*nextve; float nor[3]= {0.0, 0.0, 0.0}; @@ -915,7 +911,7 @@ { Object *obedit= CTX_data_edit_object(C); - spin_mesh(C, op,NULL); + spin_mesh(C, op,NULL,RNA_int_get(op->ptr,"steps"),RNA_float_get(op->ptr,"degrees"),RNA_int_get(op->ptr,"steps")); WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); @@ -936,12 +932,9 @@ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /*props */ - //int steps, float degr, float *dvec, int mode - RNA_def_int(ot->srna, "steps", 5, 0, INT_MAX, "Steps", "Steps", 0, INT_MAX); - RNA_def_int(ot->srna, "mode", 5, 0, INT_MAX, "Mode", "Mode", 0, INT_MAX); + RNA_def_int(ot->srna, "mode", 1, 0, INT_MAX, "Mode", "Mode", 0, INT_MAX); RNA_def_float(ot->srna, "degrees", 5.0f, 0.0f, FLT_MAX, "Degrees", "Degrees", 0.0f, FLT_MAX); - //RNA_def_enum(ot->srna, "type", prop_mesh_delete_types, 10, "Type", "Method used for deleting mesh data"); } void screw_mesh(bContext *C, wmOperator *op, int steps, int turns) @@ -1001,12 +994,39 @@ dvec[1]= -dvec[1]; dvec[2]= -dvec[2]; } + + spin_mesh(C, op, dvec, turns*steps, turns*360,0); - //TODO : set : turns*steps, turns*360,0 - spin_mesh(C, op, dvec); +} +static int screw_mesh_exec(bContext *C, wmOperator *op) +{ + Object *obedit= CTX_data_edit_object(C); + + screw_mesh(C, op,RNA_int_get(op->ptr,"steps"),RNA_int_get(op->ptr,"turns")); + + WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); + + return OPERATOR_FINISHED; } +void MESH_OT_screw(wmOperatorType *ot) +{ + /* identifiers */ + ot->name= "Screw"; + ot->idname= "MESH_OT_screw"; + + /* api callbacks */ + ot->exec= screw_mesh_exec; + ot->poll= ED_operator_editmesh; + + /* flags */ + ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + + /*props */ + RNA_def_int(ot->srna, "steps", 5, 0, INT_MAX, "Steps", "Steps", 0, INT_MAX); + RNA_def_int(ot->srna, "turns", 1, 0, INT_MAX, "Turns", "Turns", 0, INT_MAX); +} static void erase_edges(EditMesh *em, ListBase *l) { Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h === --- branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h 2009-02-18 02:13:36 UTC (rev 19020) +++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h 2009-02-18 03:01:45 UTC (rev 19021) @@ -209,6 +209,7 @@ void MESH_OT_removedoublesflag(struct wmOperatorType *ot); void MESH_OT_extrude(struct wmOperatorType *ot); void MESH_OT_spin(struct wmOperatorType *ot); +void MESH_OT_screw(struct wmOperatorType *ot); void MESH_OT_fill(struct wmOperatorType *ot); void MESH_OT_beauty_fill(struct wmOperatorType *ot); Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c === --- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c 2009-02-18 02:13:36 UTC (rev 19020) +++ branches/blender2.5/blender/source/blender/editors/mesh/m
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19022] trunk/blender/source/blender: [ #18159] Path -> toggle cyclic -> toggle cyclic again == path corrupted
Revision: 19022 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19022 Author: campbellbarton Date: 2009-02-18 04:13:57 +0100 (Wed, 18 Feb 2009) Log Message: --- [#18159] Path -> toggle cyclic -> toggle cyclic again == path corrupted was not recalculating the knots when the cyclic flag was disabled so the endpoint flag was being ignored until recalculating (extrude for eg). Also removed unneeded re-allocation of curve knots which are always reallocated by makeknots. Fixed another bug with which recalculating knots with the Python surface api. (mixed up u/v args to makeknots(..) ) Modified Paths: -- trunk/blender/source/blender/python/api2_2x/SurfNurb.c trunk/blender/source/blender/src/editcurve.c Modified: trunk/blender/source/blender/python/api2_2x/SurfNurb.c === --- trunk/blender/source/blender/python/api2_2x/SurfNurb.c 2009-02-18 03:01:45 UTC (rev 19021) +++ trunk/blender/source/blender/python/api2_2x/SurfNurb.c 2009-02-18 03:13:57 UTC (rev 19022) @@ -482,7 +482,7 @@ self->nurb->flagv |= CU_CYCLIC; else self->nurb->flagv &= ~CU_CYCLIC; - makeknots( self->nurb, 2, self->nurb->flagu >> 1 ); + makeknots( self->nurb, 2, self->nurb->flagv >> 1 ); return 0; } Modified: trunk/blender/source/blender/src/editcurve.c === --- trunk/blender/source/blender/src/editcurve.c2009-02-18 03:01:45 UTC (rev 19021) +++ trunk/blender/source/blender/src/editcurve.c2009-02-18 03:13:57 UTC (rev 19022) @@ -3065,8 +3065,8 @@ Nurb *nu; BezTriple *bezt; BPoint *bp; - float *fp; - int a, b, cyclmode=0; + + int a, cyclmode=0; for(nu= editNurb.first; nu; nu= nu->next) { if( nu->pntsu>1 || nu->pntsv>1) { @@ -3075,8 +3075,7 @@ bp= nu->bp; while(a--) { if( bp->f1 & SELECT ) { - if(nu->flagu & CU_CYCLIC) nu->flagu &= ~CU_CYCLIC; - else nu->flagu |= CU_CYCLIC; + nu->flagu ^= CU_CYCLIC; break; } bp++; @@ -3087,8 +3086,7 @@ bezt= nu->bezt; while(a--) { if( BEZSELECTED_HIDDENHANDLES(bezt) ) { - if(nu->flagu & CU_CYCLIC) nu->flagu &= ~CU_CYCLIC; - else nu->flagu |= CU_CYCLIC; + nu->flagu ^= CU_CYCLIC; break; } bezt++; @@ -3101,19 +3099,8 @@ bp= nu->bp; while(a--) { if( bp->f1 & SELECT ) { - if(nu->flagu & CU_CYCLIC) nu->flagu &= ~CU_CYCLIC; - else { - nu->flagu |= CU_CYCLIC; - nu->flagu &= ~2;/* endpoint flag, fixme */ - fp= MEM_mallocN(sizeof(float)*KNOTSU(nu), "makecyclicN"); - b= (nu->orderu+nu->pntsu); - memcpy(fp, nu->knotsu, sizeof(float)*b); - MEM_freeN(nu->knotsu); - nu->knotsu= fp; - - makeknots(nu, 1, 0);/* 1==u 0==uniform */ - - } + nu->flagu ^= CU_CYCLIC; + makeknots(nu, 1, nu->flagu>>1); /* 1==u type is ignored for cyclic curves */ break; } bp++; @@ -3131,38 +3118,12 @@ if( bp->f1 & SELECT) {
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19023] trunk/blender/source/blender: disable texture clamping while painting.
Revision: 19023 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19023 Author: campbellbarton Date: 2009-02-18 04:56:16 +0100 (Wed, 18 Feb 2009) Log Message: --- disable texture clamping while painting. Modified Paths: -- trunk/blender/source/blender/gpu/intern/gpu_draw.c trunk/blender/source/blender/src/editface.c Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c === --- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2009-02-18 03:13:57 UTC (rev 19022) +++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2009-02-18 03:56:16 UTC (rev 19023) @@ -167,6 +167,8 @@ static int is_pow2_limit(int num) { /* take texture clamping into account */ + if (G.f & G_TEXTUREPAINT) + return 1; if (U.glreslimit != 0 && num > U.glreslimit) return 0; @@ -175,6 +177,9 @@ static int smaller_pow2_limit(int num) { + if (G.f & G_TEXTUREPAINT) + return 1; + /* take texture clamping into account */ if (U.glreslimit != 0 && num > U.glreslimit) return U.glreslimit; Modified: trunk/blender/source/blender/src/editface.c === --- trunk/blender/source/blender/src/editface.c 2009-02-18 03:13:57 UTC (rev 19022) +++ trunk/blender/source/blender/src/editface.c 2009-02-18 03:56:16 UTC (rev 19023) @@ -51,6 +51,7 @@ #include "DNA_space_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" +#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "BKE_brush.h" @@ -1321,6 +1322,10 @@ if(G.f & G_TEXTUREPAINT) { G.f &= ~G_TEXTUREPAINT; + + if (U.glreslimit != 0) + GPU_free_images(); + GPU_paint_set_mipmap(1); } else if (me) { @@ -1328,7 +1333,10 @@ if(me->mtface==NULL) make_tfaces(me); - + + if (U.glreslimit != 0) + GPU_free_images(); + brush_check_exists(&G.scene->toolsettings->imapaint.brush); GPU_paint_set_mipmap(0); } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19024] branches/blender2.5/blender: * More icon updates
Revision: 19024 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19024 Author: broken Date: 2009-02-18 05:36:07 +0100 (Wed, 18 Feb 2009) Log Message: --- * More icon updates Modified Paths: -- branches/blender2.5/blender/release/datafiles/blenderbuttons branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c branches/blender2.5/blender/source/blender/editors/include/UI_resources.h branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c branches/blender2.5/blender/source/blender/editors/space_image/image_header.c branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c Modified: branches/blender2.5/blender/release/datafiles/blenderbuttons === (Binary files differ) Modified: branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c === --- branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c 2009-02-18 03:56:16 UTC (rev 19023) +++ branches/blender2.5/blender/source/blender/editors/datafiles/blenderbuttons.c 2009-02-18 04:36:07 UTC (rev 19024) @@ -1,3876 +1,3877 @@ /* DataToC output of file */ -int datatoc_blenderbuttons_size= 123826; +int datatoc_blenderbuttons_size= 123869; char datatoc_blenderbuttons[]= { -137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, - 2, 88, 0, 0, 2, 0, 8, 6, 0, 0, 0, 94,187, 18, 70, 0, 0, 0, 9,112, 72, 89,115, 0, 0, 13,215, 0, 0, 13,215, 1, - 66, 40,155,120, 0, 0, 10, 77,105, 67, 67, 80, 80,104,111,116,111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,105,108, -101, 0, 0,120,218,157, 83,119, 88,147,247, 22, 62,223,247,101, 15, 86, 66,216,240,177,151,108,129, 0, 34, 35,172, 8,200, 16, - 89,162, 16,146, 0, 97,132, 16, 18, 64,197,133,136, 10, 86, 20, 21, 17,156, 72, 85,196,130,213, 10, 72,157,136,226,160, 40,184, -103, 65,138,136, 90,139, 85, 92, 56,238, 31,220,167,181,125,122,239,237,237,251,215,251,188,231,156,231,252,206,121,207, 15,128, - 17, 18, 38,145,230,162,106, 0, 57, 82,133, 60, 58,216, 31,143, 79, 72,196,201,189,128, 2, 21, 72,224, 4, 32, 16,230,203,194, -103, 5,197, 0, 0,240, 3,121,120,126,116,176, 63,252, 1,175,111, 0, 2, 0,112,213, 46, 36, 18,199,225,255,131,186, 80, 38, - 87, 0, 32,145, 0,224, 34, 18,231, 11, 1,144, 82, 0,200, 46, 84,200, 20, 0,200, 24, 0,176, 83,179,100, 10, 0,148, 0, 0, -108,121,124, 66, 34, 0,170, 13, 0,236,244, 73, 62, 5, 0,216,169,147,220, 23, 0,216,162, 28,169, 8, 0,141, 1, 0,153, 40, - 71, 36, 2, 64,187, 0, 96, 85,129, 82, 44, 2,192,194, 0,160,172, 64, 34, 46, 4,192,174, 1,128, 89,182, 50, 71, 2,128,189, - 5, 0,118,142, 88,144, 15, 64, 96, 0,128,153, 66, 44,204, 0, 32, 56, 2, 0, 67, 30, 19,205, 3, 32, 76, 3,160, 48,210,191, -224,169, 95,112,133,184, 72, 1, 0,192,203,149,205,151, 75,210, 51, 20,184,149,208, 26,119,242,240,224,226, 33,226,194,108,177, - 66, 97, 23, 41, 16,102, 9,228, 34,156,151,155, 35, 19, 72,231, 3, 76,206, 12, 0, 0, 26,249,209,193,254, 56, 63,144,231,230, -228,225,230,102,231,108,239,244,197,162,254,107,240,111, 34, 62, 33,241,223,254,188,140, 2, 4, 0, 16, 78,207,239,218, 95,229, -229,214, 3,112,199, 1,176,117,191,107,169, 91, 0,218, 86, 0,104,223,249, 93, 51,219, 9,160, 90, 10,208,122,249,139,121, 56, -252, 64, 30,158,161, 80,200, 60, 29, 28, 10, 11, 11,237, 37, 98,161,189, 48,227,139, 62,255, 51,225,111,224,139,126,246,252, 64, - 30,254,219,122,240, 0,113,154, 64,153,173,192,163,131,253,113, 97,110,118,174, 82,142,231,203, 4, 66, 49,110,247,231, 35,254, -199,133,127,253,142, 41,209,226, 52,177, 92, 44, 21,138,241, 88,137,184, 80, 34, 77,199,121,185, 82,145, 68, 33,201,149,226, 18, -233,127, 50,241, 31,150,253, 9,147,119, 13, 0,172,134, 79,192, 78,182, 7,181,203,108,192,126,238, 1, 2,139, 14, 88,210,118, - 0, 64,126,243, 45,140, 26, 11,145, 0, 16,103, 52, 50,121,247, 0, 0,147,191,249,143, 64, 43, 1, 0,205,151,164,227, 0, 0, -188,232, 24, 92,168,148, 23, 76,198, 8, 0, 0, 68,160,129, 42,176, 65, 7, 12,193, 20,172,192, 14,156,193, 29,188,192, 23, 2, - 97, 6, 68, 64, 12, 36,192, 60, 16, 66, 6,228,128, 28, 10,161, 24,150, 65, 25, 84,192, 58,216, 4,181,176, 3, 26,160, 17,154, -225, 16,180,193, 49, 56, 13,231,224, 18, 92,129,235,112, 23, 6, 96, 24,158,194, 24,188,134, 9, 4, 65,200, 8, 19, 97, 33, 58, -136, 17, 98,142,216, 34,206, 8, 23,153,142, 4, 34, 97, 72, 52,146,128,164, 32,233,136, 20, 81, 34,197,200,114,164, 2,169, 66, -106,145, 93, 72, 35,242, 45,114, 20, 57,141, 92, 64,250,144,219,200, 32, 50,138,252,138,188, 71, 49,148,129,178, 81, 3,212, 2, -117, 64,185,168, 31, 26,138,198,160,115,209,116, 52, 15, 93,128,150,162,107
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19025] trunk/blender/source/blender/src/ drawobject.c: uninitialized variable used in mesh_foreachScreenVert__mapFunc
Revision: 19025 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19025 Author: campbellbarton Date: 2009-02-18 05:43:12 +0100 (Wed, 18 Feb 2009) Log Message: --- uninitialized variable used in mesh_foreachScreenVert__mapFunc Modified Paths: -- trunk/blender/source/blender/src/drawobject.c Modified: trunk/blender/source/blender/src/drawobject.c === --- trunk/blender/source/blender/src/drawobject.c 2009-02-18 04:36:07 UTC (rev 19024) +++ trunk/blender/source/blender/src/drawobject.c 2009-02-18 04:43:12 UTC (rev 19025) @@ -1196,15 +1196,18 @@ { struct { void (*func)(void *userData, EditVert *eve, int x, int y, int index); void *userData; int clipVerts; float pmat[4][4], vmat[4][4]; } *data = userData; EditVert *eve = EM_get_vert_for_index(index); - short s[2]; if (eve->h==0) { + short s[2]= {IS_CLIPPED, 0}; if (data->clipVerts) { view3d_project_short_clip(curarea, co, s, data->pmat, data->vmat); } else { view3d_project_short_noclip(curarea, co, s, data->pmat); } - + + if (s[0]==IS_CLIPPED) + return; + data->func(data->userData, eve, s[0], s[1], index); } } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19026] trunk/blender/source/blender: more uninitialized variables and auto-complete could copy a string over its self .
Revision: 19026 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19026 Author: campbellbarton Date: 2009-02-18 06:49:51 +0100 (Wed, 18 Feb 2009) Log Message: --- more uninitialized variables and auto-complete could copy a string over its self. Modified Paths: -- trunk/blender/source/blender/blenloader/intern/writefile.c trunk/blender/source/blender/src/drawobject.c trunk/blender/source/blender/src/interface.c Modified: trunk/blender/source/blender/blenloader/intern/writefile.c === --- trunk/blender/source/blender/blenloader/intern/writefile.c 2009-02-18 04:43:12 UTC (rev 19025) +++ trunk/blender/source/blender/blenloader/intern/writefile.c 2009-02-18 05:49:51 UTC (rev 19026) @@ -2032,7 +2032,7 @@ fg.subversion= BLENDER_SUBVERSION; fg.minversion= BLENDER_MINVERSION; fg.minsubversion= BLENDER_MINSUBVERSION; - + fg.pads= 0; /* prevent mem checkers from complaining */ writestruct(wd, GLOB, "FileGlobal", 1, &fg); } Modified: trunk/blender/source/blender/src/drawobject.c === --- trunk/blender/source/blender/src/drawobject.c 2009-02-18 04:43:12 UTC (rev 19025) +++ trunk/blender/source/blender/src/drawobject.c 2009-02-18 05:49:51 UTC (rev 19026) @@ -1096,14 +1096,15 @@ float *co = dl?dl->verts:NULL; BPoint *bp = editLatt->def; float pmat[4][4], vmat[4][4]; - short s[2]; + short s[2] = {IS_CLIPPED, 0}; view3d_get_object_project_mat(curarea, G.obedit, pmat, vmat); for (i=0; ihide==0) { view3d_project_short_clip(curarea, dl?co:bp->vec, s, pmat, vmat); - func(userData, bp, s[0], s[1]); + if (s[0] != IS_CLIPPED) + func(userData, bp, s[0], s[1]); } } } @@ -1303,7 +1304,7 @@ void nurbs_foreachScreenVert(void (*func)(void *userData, Nurb *nu, BPoint *bp, BezTriple *bezt, int beztindex, int x, int y), void *userData) { float pmat[4][4], vmat[4][4]; - short s[2]; + short s[2] = {IS_CLIPPED, 0}; Nurb *nu; int i; @@ -1339,7 +1340,8 @@ if(bp->hide==0) { view3d_project_short_clip(curarea, bp->vec, s, pmat, vmat); - func(userData, nu, bp, NULL, -1, s[0], s[1]); + if (s[0] != IS_CLIPPED) + func(userData, nu, bp, NULL, -1, s[0], s[1]); } } } Modified: trunk/blender/source/blender/src/interface.c === --- trunk/blender/source/blender/src/interface.c2009-02-18 04:43:12 UTC (rev 19025) +++ trunk/blender/source/blender/src/interface.c2009-02-18 05:49:51 UTC (rev 19026) @@ -6083,12 +6083,13 @@ } void autocomplete_end(AutoComplete *autocpl, char *autoname) -{ +{ if(autocpl->truncate[0]) BLI_strncpy(autoname, autocpl->truncate, autocpl->maxlen); - else - BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen); - + else { + if (autoname != autocpl->startname) /* dont copy a string over its self */ + BLI_strncpy(autoname, autocpl->startname, autocpl->maxlen); + } MEM_freeN(autocpl->truncate); MEM_freeN(autocpl); } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19027] branches/blender2.5/blender/source /blender/editors: * Cleaned up naming of icon ID constants.
Revision: 19027 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19027 Author: broken Date: 2009-02-18 06:54:37 +0100 (Wed, 18 Feb 2009) Log Message: --- * Cleaned up naming of icon ID constants. This helps fix bad icons in the graph editor among others. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c branches/blender2.5/blender/source/blender/editors/include/UI_resources.h branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c branches/blender2.5/blender/source/blender/editors/space_action/action_header.c branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c branches/blender2.5/blender/source/blender/editors/space_node/node_header.c branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c === --- branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c 2009-02-18 05:49:51 UTC (rev 19026) +++ branches/blender2.5/blender/source/blender/editors/animation/anim_ipo_utils.c 2009-02-18 05:54:37 UTC (rev 19027) @@ -65,17 +65,17 @@ { switch (blocktype) { case ID_OB: - return ICON_OBJECT; + return ICON_OBJECT_DATA; case ID_PO: return ICON_POSE_HLT; case ID_KE: - return ICON_SHAPEKEY; + return ICON_SHAPEKEY_DATA; case ID_MA: return ICON_MATERIAL; case ID_WO: return ICON_WORLD; case ID_CU: - return ICON_CURVE; + return ICON_CURVE_DATA; case ID_CA: return ICON_CAMERA; case ID_LA: Modified: branches/blender2.5/blender/source/blender/editors/include/UI_resources.h === --- branches/blender2.5/blender/source/blender/editors/include/UI_resources.h 2009-02-18 05:49:51 UTC (rev 19026) +++ branches/blender2.5/blender/source/blender/editors/include/UI_resources.h 2009-02-18 05:54:37 UTC (rev 19027) @@ -179,7 +179,7 @@ ICON_BLANK061b, /* MODES */ - ICON_OBJECTMODE,// XXX fix this up + ICON_OBJECT_DATAMODE, // XXX fix this up ICON_EDITMODE_HLT, ICON_FACESEL_HLT, ICON_VPAINT_HLT, @@ -207,27 +207,27 @@ ICON_BLANK077b, /* DATA */ - ICON_SCENE_DEHLT, + ICON_SCENE_DATA, ICON_RENDERLAYERS, - ICON_WORLD_DEHLT, - ICON_OBJECT, - ICON_MESH, - ICON_CURVE, - ICON_MBALL, - ICON_LATTICE, - ICON_LAMP_DEHLT, - ICON_MATERIAL_DEHLT, - ICON_TEXTURE_DEHLT, - ICON_IPO_DEHLT, - ICON_CAMERA_DEHLT, + ICON_WORLD_DATA, + ICON_OBJECT_DATA, + ICON_MESH_DATA, + ICON_CURVE_DATA, + ICON_MBALL_DATA, + ICON_LATTICE_DATA, + ICON_LAMP_DATA, + ICON_MATERIAL_DATA, + ICON_TEXTURE_DATA, + ICON_ANIM_DATA, + ICON_CAMERA_DATA, ICON_PARTICLE_DATA, - ICON_LIBRARY_DEHLT, + ICON_LIBRARY_DATA_DIRECT, ICON_GROUP, - ICON_ARMATURE, - ICON_POSE_DEHLT, - ICON_BONE_DEHLT, + ICON_ARMATURE_DATA, + ICON_POSE_DATA, + ICON_BONE_DATA, ICON_CONSTRAINT, - ICON_SHAPEKEY, + ICON_SHAPEKEY_DATA, ICON_VGROUP, ICON_BLANK079, ICON_PACKAGE, @@ -235,8 +235,8 @@ ICON_BLANK079b, /* DATA */ - ICON_BRUSH, - ICON_IMAGE_DEHLT, + ICON_BRUSH_DATA, + ICON_IMAGE_DATA, ICON_FILE, ICON_FCURVE, ICON_FONT, @@ -249,7 +249,7 @@ ICON_BLANK080F, ICON_BLANK080, ICON_BLANK081, - ICON_LIBRARY_HLT, + ICON_LIBRARY_DATA_INDIRECT, ICON_BLANK082, ICON_BLANK083, ICON_BLANK084, Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c === --- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 20
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19028] branches/blender2.5/blender/source /blender/editors: * More icon naming updates
Revision: 19028 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19028 Author: broken Date: 2009-02-18 07:03:14 +0100 (Wed, 18 Feb 2009) Log Message: --- * More icon naming updates Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c === --- branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c 2009-02-18 05:54:37 UTC (rev 19027) +++ branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c 2009-02-18 06:03:14 UTC (rev 19028) @@ -451,7 +451,7 @@ group= 4; indent= 0; - special= ICON_SCENE; + special= ICON_SCENE_DATA; /* only show expand if there are any channels */ if (EXPANDED_SCEC(sce)) @@ -510,7 +510,7 @@ group = 4; indent = 1; - special = ICON_MATERIAL; + special = ICON_MATERIAL_DATA; if (FILTER_MAT_OBJC(ob)) expand = ICON_TRIA_DOWN; @@ -528,7 +528,7 @@ group = 0; indent = 0; - special = ICON_MATERIAL; + special = ICON_MATERIAL_DATA; offset = 21; if (FILTER_MAT_OBJD(ma)) @@ -545,7 +545,7 @@ group = 4; indent = 1; - special = ICON_LAMP; + special = ICON_LAMP_DATA; if (FILTER_LAM_OBJD(la)) expand = ICON_TRIA_DOWN; @@ -561,7 +561,7 @@ group = 4; indent = 1; - special = ICON_CAMERA; + special = ICON_CAMERA_DATA; if (FILTER_CAM_OBJD(ca)) expand = ICON_TRIA_DOWN; @@ -593,7 +593,7 @@ group = 4; indent = 1; - special = ICON_EDIT; // XXX + special = ICON_SHAPEKEY_DATA; // XXX if (FILTER_SKE_OBJD(key)) expand = ICON_TRIA_DOWN; @@ -610,7 +610,7 @@ group = 4; indent = 1; - special = ICON_WORLD; + special = ICON_WORLD_DATA; if (FILTER_WOR_SCED(wo)) expand = ICON_TRIA_DOWN; Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c === --- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c 2009-02-18 05:54:37 UTC (rev 19027) +++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c 2009-02-18 06:03:14 UTC (rev 19028) @@ -813,7 +813,7 @@ group= 4; indent= 0; - special= ICON_SCENE; + special= ICON_SCENE_DATA; /* only show expand if there are any
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19029] branches/blender2.5/blender/source /blender/editors/transform/transform_generics.c: Bugfix for Record Transform Animation
Revision: 19029 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19029 Author: aligorith Date: 2009-02-18 07:25:57 +0100 (Wed, 18 Feb 2009) Log Message: --- Bugfix for Record Transform Animation Only selected objects are now keyframed. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c Modified: branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c === --- branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-18 06:03:14 UTC (rev 19028) +++ branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c 2009-02-18 06:25:57 UTC (rev 19029) @@ -589,14 +589,17 @@ if(base->flag & BA_HAS_RECALC_DATA) ob->recalc |= OB_RECALC_DATA; - /* if animtimer is running, and the object already has animation data, -* check if the auto-record feature means that we should record 'samples' -* (i.e. uneditable animation values) -*/ - // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? - // TODO: maybe the ob->adt check isn't really needed? makes it too difficult to use... - if (/*(ob->adt) && */(t->animtimer) && IS_AUTOKEY_ON(t->scene)) { - autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode); + /* if object/base is selected */ + if ((base->flag & SELECT) || (ob->flag & SELECT)) { + /* if animtimer is running, and the object already has animation data, +* check if the auto-record feature means that we should record 'samples' +* (i.e. uneditable animation values) +*/ + // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? + // TODO: maybe the ob->adt check isn't really needed? makes it too difficult to use... + if (/*(ob->adt) && */(t->animtimer) && IS_AUTOKEY_ON(t->scene)) { + autokeyframe_ob_cb_func(t->scene, (View3D *)t->view, ob, t->mode); + } } /* proxy exception */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs