Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46440] tags/blender-2.63a-release/blender : blender 2.63a: merge changes from trunk into tag
Hi Sergey, Did some testing and looked into the commits you mentioned to see if they got merged / left out correctly. All looks ok to me. Thanks for doing this messy job :) Brecht. On Wed, May 9, 2012 at 12:20 AM, Sergey Sharybin wrote: > > * 46159: seems to be a fix for post-release merge tomato into trunk 46023 > with bunch of optimizations, changes are currently ignored > * 46179: some of changes in camera.cpp and object.cpp are related on 46114 > which > added support for motion vector and UV passes, later Brecht cleaned up > all changes related holdout due to the got mixed with motion blur. > * 46181: changes in rna_lamp touches code from rev46134 (merge Harmony branch) > and can not be applied on pre-merge state > * 46222: none changes applied - all of them is for code introduced in 46175 > which isn't getting backported to tag > * 46341: completely skip -- related to changes from 46279 which is not > getting backported > * 46277: changes to mesh.c (which the only actual interesting changes here) > are ignored. > Comment says "improvement to LAST commit" and this LAST commit is not > getting merged. Hopefully merge conflicts were resolved in a way which > keeps file in a state previous to 46276. > * Commits related on solidify modifier. They got totally screwed up > MOD_solidify.c > due to all that style cleanup and so. Finished up backporting MOD_solidify.c > from > trunk into tag by reverting style commits (seems all actual changes need to > be > backported there). Hopefully it's fine now. > * 46417: some Changes in smoke.c are related on changes made in merge commit > from > smoke2 branch into trunk. Hopefully the same changes works fine with > pre-merged smoke. ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
[Bf-committers] [PATCH] Implement AUD_Reference in terms of boost::shared_ptr to ensure basic thread safety
Hi, I submitted a new patch for revision [1]. [1] http://projects.blender.org/tracker/index.php?func=detail&aid=31372&group_id=9&atid=127 -- Best Regards, Wander Lairson Costa ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46422] trunk/blender/source/blender: optimize ngon angle calculation in solidify modifier (was doing prev/ next vector subtract a
Its reasonable, fairly sure I already suggested this to Andrei Simionescu (gsoc student) On Wed, May 9, 2012 at 1:29 AM, Knapp wrote: > On Tue, May 8, 2012 at 5:11 PM, Johnny Matthews > wrote: >> This has very little to do with this commit, but it made me think of it, I >> wonder if those smarter than me think that a way to select all 'non flat' >> ngons would be useful. >> >> Johnny Matthews (guitargeek) >> johnny.matth...@gmail.com >> http://pedalboardplanner.com > > I don't claim to be smarter but I could see it as useful when you > needed to clean up a model for animation and you wanted to find places > that don't bend well. > > > -- > Douglas E Knapp > > Creative Commons Film Group, Helping people make open source movies > with open source software! > http://douglas.bespin.org/CommonsFilmGroup/phpBB3/index.php > > Massage in Gelsenkirchen-Buer: > http://douglas.bespin.org/tcm/ztab1.htm > Please link to me and trade links with me! > > Open Source Sci-Fi mmoRPG Game project. > http://sf-journey-creations.wikispot.org/Front_Page > http://code.google.com/p/perspectiveproject/ > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers -- - Campbell ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46422] trunk/blender/source/blender: optimize ngon angle calculation in solidify modifier (was doing prev/ next vector subtract a
On Tue, May 8, 2012 at 5:11 PM, Johnny Matthews wrote: > This has very little to do with this commit, but it made me think of it, I > wonder if those smarter than me think that a way to select all 'non flat' > ngons would be useful. > > Johnny Matthews (guitargeek) > johnny.matth...@gmail.com > http://pedalboardplanner.com I don't claim to be smarter but I could see it as useful when you needed to clean up a model for animation and you wanted to find places that don't bend well. -- Douglas E Knapp Creative Commons Film Group, Helping people make open source movies with open source software! http://douglas.bespin.org/CommonsFilmGroup/phpBB3/index.php Massage in Gelsenkirchen-Buer: http://douglas.bespin.org/tcm/ztab1.htm Please link to me and trade links with me! Open Source Sci-Fi mmoRPG Game project. http://sf-journey-creations.wikispot.org/Front_Page http://code.google.com/p/perspectiveproject/ ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46422] trunk/blender/source/blender: optimize ngon angle calculation in solidify modifier (was doing prev/ next vector subtract a
This has very little to do with this commit, but it made me think of it, I
wonder if those smarter than me think that a way to select all 'non flat'
ngons would be useful.
Johnny Matthews (guitargeek)
johnny.matth...@gmail.com
http://pedalboardplanner.com
On Tue, May 8, 2012 at 9:58 AM, Campbell Barton wrote:
> Revision: 46422
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46422
> Author: campbellbarton
> Date: 2012-05-08 14:58:38 + (Tue, 08 May 2012)
> Log Message:
> ---
> optimize ngon angle calculation in solidify modifier (was doing prev/next
> vector subtract and normalize for every vertex). now store the previous
> normalized vector for re-use.
>
> also add BKE_mesh_poly_calc_angles() which is mostly a reference for now.
>
> Modified Paths:
> --
>trunk/blender/source/blender/blenkernel/BKE_mesh.h
>trunk/blender/source/blender/blenkernel/intern/mesh.c
>trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
>
> Modified: trunk/blender/source/blender/blenkernel/BKE_mesh.h
> ===
> --- trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-05-08
> 13:01:16 UTC (rev 46421)
> +++ trunk/blender/source/blender/blenkernel/BKE_mesh.h 2012-05-08
> 14:58:38 UTC (rev 46422)
> @@ -304,6 +304,9 @@
> const int polyindex, const int mf_len,
> const int numTex, const int numCol,
> const int hasPCol, const int hasOrigSpace);
>
> +void BKE_mesh_poly_calc_angles(struct MVert *mvert, struct MLoop *mloop,
> + struct MPoly *mp, float angles[]);
> +
> #ifdef __cplusplus
> }
> #endif
>
> Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
> ===
> --- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-08
> 13:01:16 UTC (rev 46421)
> +++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-05-08
> 14:58:38 UTC (rev 46422)
> @@ -3103,3 +3103,51 @@
> {
>mesh_tessface_clear_intern(mesh, TRUE);
> }
> +
> +#if 0 /* slow version of the function below */
> +void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop,
> + MPoly *mp, float angles[])
> +{
> + MLoop *ml;
> +
> + int j;
> + for (j = 0, ml = mloop + mp->loopstart; j < mp->totloop; j++,
> ml++) {
> + MLoop *ml_prev = ME_POLY_LOOP_PREV(mloop, mp, j);
> + MLoop *ml_next = ME_POLY_LOOP_NEXT(mloop, mp, j);
> +
> + float e1[3], e2[3];
> +
> + sub_v3_v3v3(e1, mvert[ml_next->v].co, mvert[ml->v].co);
> + sub_v3_v3v3(e2, mvert[ml_prev->v].co, mvert[ml->v].co);
> +
> + angles[j] = (float)M_PI - angle_v3v3(e1, e2);
> + }
> +}
> +
> +#else /* equivalent the function above but avoid multiple subtractions +
> normalize */
> +
> +void BKE_mesh_poly_calc_angles(MVert *mvert, MLoop *mloop,
> + MPoly *mp, float angles[])
> +{
> + MLoop *ml = mloop + mp->loopstart;
> + float nor_prev[3];
> + float nor_next[3];
> +
> + int i_this = mp->totloop - 1;
> + int i_next = 0;
> +
> + sub_v3_v3v3(nor_prev, mvert[ml[i_this - 1].v].co,
> mvert[ml[i_this].v].co);
> + normalize_v3(nor_prev);
> +
> + while (i_next < mp->totloop) {
> + sub_v3_v3v3(nor_next, mvert[ml[i_this].v].co,
> mvert[ml[i_next].v].co);
> + normalize_v3(nor_next);
> + angles[i_this] = angle_normalized_v3v3(nor_prev, nor_next);
> +
> + /* step */
> + copy_v3_v3(nor_prev, nor_next);
> + i_this = i_next;
> + i_next++;
> + }
> +}
> +#endif
>
> Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
> ===
> --- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
> 2012-05-08 13:01:16 UTC (rev 46421)
> +++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
> 2012-05-08 14:58:38 UTC (rev 46422)
> @@ -451,7 +451,7 @@
>/* same as EM_solidify() in editmesh_lib.c */
>float *vert_angles = MEM_callocN(sizeof(float) * numVerts *
> 2, "mod_solid_pair"); /* 2 in 1 */
>float *vert_accum = vert_angles + numVerts;
> - int j, vidx;
> + int vidx;
>
>face_nors = CustomData_get_layer(&dm->polyData, CD_NORMAL);
>if (!face_nors) {
> @@ -467,30 +467,44 @@
>}
>
>for (i = 0, mp = mpoly; i < numFaces; i++, mp++) {
> + /* #BKE_mesh_poly_calc_angles logic is inlined
> here */
> + float nor_prev[3];
> + float nor_next[3];
> +
> + int i_this = mp->totloop - 1;
> +
Re: [Bf-committers] 2.63a bugfix relerase - rev:dev mapping
On Tue, May 8, 2012 at 2:03 PM, Campbell Barton wrote: > Brecht: should we add?: > 46366 No, this is a fix for a new feature. Brecht. ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] 2.63a bugfix release - rev:dev mapping
Added to wiki: 46214 46215 46246 Rather not this - Implementation of 'Apply Modifiers' ... since its a new feature. We have over 100 revisions to merge and this is going to be tricky - if more fixing keep coming into trunk we may be better to just do a regular release (short release cycle). On Tue, May 8, 2012 at 7:36 PM, Gaia wrote: > Hi. > > I think this Cycles related fix should be included: > > 46132: face select mode broken in weight paint (report 31199) > > > About COLLADA: > > I am not sure if this is possible or feasible, but it would be > awesome to get the recent fixes of the Collada module into > the release. So if ever possible, please consider to also add > following fixes: > > svn r46392: patch #31331: Implementation of 'Apply Modifiers' > svn r46394: patch #31331: Implementation of 'Apply Modifiers' > svn r46214: Imports rendered black (report 31248) > svn r46215: Export most recent edits (report 31256) > svn r46246: Select the set of Imported objects automatically (31258) > > And if possible add this patch: > > http://projects.blender.org/tracker/index.php?func=detail&aid=31335&group_id=9&atid=127 > > which solves this problem: > > http://projects.blender.org/tracker/?func=detail&aid=31362&group_id=9&atid=498 > > Thank you. > > cheers, > Gaia > > On 08.05.2012 07:12, Mike Erwin wrote: >> Any chance of getting 46410 in? It's a one-line change that fixes a >> 2.63 regression for serial port 3D mice. >> >> Mike Erwin >> musician, naturalist, pixel pusher, hacker extraordinaire >> >>> Le dim. 06 mai 2012 23:41:22 CEST, Campbell Barton a écrit : Heres a list of fixes to include in 2.63a - by developer, Id like to know if there are any missing of that should not be included. alexk: 46172 aligorith: 46072, 46077, 46152, 46158, 46280, 46308, 46316, 46342 46345, 46342, 46338, 46336 bjornmose: 46004 blendix: 46117, 46120, 46125, 46141, 46142, 46156, 46159, 46160, 46179, 46180, 46181, 46183, 46192, 46194, 46196, 46205, 46206, 46213, 46214, 46215, 46224, 46225, 46226, 46231, 46232, 46233, 46234, 46241, 46246, 46250, 46260, 46261, 46264, 46265, 46273, 46289, 46310, 46311, 46327 campbellbarton: 46003, 46005, 46014, 46015, 46016, 46095, 46127, 46131, 46136, 46184, 46277, 46278, 46282, 46290, 46294, 46346, 46347, 46361, 46362, 46363 dingto: 46043, 46093 gsrb3d: 46253 kanttori: 46197 lockal: 46116 lukastoenne: 46138, 46222 moguri: 46085 mont29: 46149, 46155, 46341 nazgul: 46027, 46028, 46039, 46140, 46143, 46148, 46157, 46178, 46227, 46229, 46230, 46235, 46236, 46269 nexyon: 46035, 46036, 46305 psy-fi: 46228 scourage: 46091 --- up until r46363 For original list see: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29 >> ___ >> Bf-committers mailing list >> Bf-committers@blender.org >> http://lists.blender.org/mailman/listinfo/bf-committers > > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers -- - Campbell ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] 2.63a bugfix relerase - rev:dev mapping
Updated wiki as of 46419: added: 46385 46391 46393 46410 46411 46412 46417 46416 46354 remove: 46155 Brecht: should we add?: 46366 On Tue, May 8, 2012 at 9:44 PM, Lockal S wrote: > r46116 (basically unicode fix, so not very important) introduced a > more obvious problem with word selection using ctrl+left or > ctrl+right. This problem was fixed in r46416. So I think it would be > better to apply both r46116 and r46416 (if it is possible) or do not > apply any of them. > > 2012/5/7 Campbell Barton : >> Heres a list of fixes to include in 2.63a - by developer, Id like to >> know if there are any missing of that should not be included. >> >> alexk: 46172 >> aligorith: 46072, 46077, 46152, 46158, 46280, 46308, 46316, 46342 >> 46345, 46342, 46338, 46336 >> bjornmose: 46004 >> blendix: 46117, 46120, 46125, 46141, 46142, 46156, 46159, 46160, >> 46179, 46180, 46181, 46183, 46192, 46194, 46196, 46205, 46206, 46213, >> 46214, 46215, 46224, 46225, 46226, 46231, 46232, 46233, 46234, 46241, >> 46246, 46250, 46260, 46261, 46264, 46265, 46273, 46289, 46310, 46311, >> 46327 >> campbellbarton: 46003, 46005, 46014, 46015, 46016, 46095, 46127, >> 46131, 46136, 46184, 46277, 46278, 46282, 46290, 46294, 46346, 46347, >> 46361, 46362, 46363 >> dingto: 46043, 46093 >> gsrb3d: 46253 >> kanttori: 46197 >> lockal: 46116 >> lukastoenne: 46138, 46222 >> moguri: 46085 >> mont29: 46149, 46155, 46341 >> nazgul: 46027, 46028, 46039, 46140, 46143, 46148, 46157, 46178, 46227, >> 46229, 46230, 46235, 46236, 46269 >> nexyon: 46035, 46036, 46305 >> psy-fi: 46228 >> scourage: 46091 >> >> --- up until r46363 >> >> For original list see: >> http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29 >> ___ >> Bf-committers mailing list >> Bf-committers@blender.org >> http://lists.blender.org/mailman/listinfo/bf-committers > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers -- - Campbell ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] 2.63a bugfix relerase - rev:dev mapping
r46116 (basically unicode fix, so not very important) introduced a more obvious problem with word selection using ctrl+left or ctrl+right. This problem was fixed in r46416. So I think it would be better to apply both r46116 and r46416 (if it is possible) or do not apply any of them. 2012/5/7 Campbell Barton : > Heres a list of fixes to include in 2.63a - by developer, Id like to > know if there are any missing of that should not be included. > > alexk: 46172 > aligorith: 46072, 46077, 46152, 46158, 46280, 46308, 46316, 46342 > 46345, 46342, 46338, 46336 > bjornmose: 46004 > blendix: 46117, 46120, 46125, 46141, 46142, 46156, 46159, 46160, > 46179, 46180, 46181, 46183, 46192, 46194, 46196, 46205, 46206, 46213, > 46214, 46215, 46224, 46225, 46226, 46231, 46232, 46233, 46234, 46241, > 46246, 46250, 46260, 46261, 46264, 46265, 46273, 46289, 46310, 46311, > 46327 > campbellbarton: 46003, 46005, 46014, 46015, 46016, 46095, 46127, > 46131, 46136, 46184, 46277, 46278, 46282, 46290, 46294, 46346, 46347, > 46361, 46362, 46363 > dingto: 46043, 46093 > gsrb3d: 46253 > kanttori: 46197 > lockal: 46116 > lukastoenne: 46138, 46222 > moguri: 46085 > mont29: 46149, 46155, 46341 > nazgul: 46027, 46028, 46039, 46140, 46143, 46148, 46157, 46178, 46227, > 46229, 46230, 46235, 46236, 46269 > nexyon: 46035, 46036, 46305 > psy-fi: 46228 > scourage: 46091 > > --- up until r46363 > > For original list see: > http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29 > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
Re: [Bf-committers] 2.63a bugfix release - rev:dev mapping
Hi. I think this Cycles related fix should be included: 46132: face select mode broken in weight paint (report 31199) About COLLADA: I am not sure if this is possible or feasible, but it would be awesome to get the recent fixes of the Collada module into the release. So if ever possible, please consider to also add following fixes: svn r46392: patch #31331: Implementation of 'Apply Modifiers' svn r46394: patch #31331: Implementation of 'Apply Modifiers' svn r46214: Imports rendered black (report 31248) svn r46215: Export most recent edits (report 31256) svn r46246: Select the set of Imported objects automatically (31258) And if possible add this patch: http://projects.blender.org/tracker/index.php?func=detail&aid=31335&group_id=9&atid=127 which solves this problem: http://projects.blender.org/tracker/?func=detail&aid=31362&group_id=9&atid=498 Thank you. cheers, Gaia On 08.05.2012 07:12, Mike Erwin wrote: > Any chance of getting 46410 in? It's a one-line change that fixes a > 2.63 regression for serial port 3D mice. > > Mike Erwin > musician, naturalist, pixel pusher, hacker extraordinaire > >> Le dim. 06 mai 2012 23:41:22 CEST, Campbell Barton a écrit : >>> Heres a list of fixes to include in 2.63a - by developer, Id like to >>> know if there are any missing of that should not be included. >>> >>> alexk: 46172 >>> aligorith: 46072, 46077, 46152, 46158, 46280, 46308, 46316, 46342 >>> 46345, 46342, 46338, 46336 >>> bjornmose: 46004 >>> blendix: 46117, 46120, 46125, 46141, 46142, 46156, 46159, 46160, >>> 46179, 46180, 46181, 46183, 46192, 46194, 46196, 46205, 46206, 46213, >>> 46214, 46215, 46224, 46225, 46226, 46231, 46232, 46233, 46234, 46241, >>> 46246, 46250, 46260, 46261, 46264, 46265, 46273, 46289, 46310, 46311, >>> 46327 >>> campbellbarton: 46003, 46005, 46014, 46015, 46016, 46095, 46127, >>> 46131, 46136, 46184, 46277, 46278, 46282, 46290, 46294, 46346, 46347, >>> 46361, 46362, 46363 >>> dingto: 46043, 46093 >>> gsrb3d: 46253 >>> kanttori: 46197 >>> lockal: 46116 >>> lukastoenne: 46138, 46222 >>> moguri: 46085 >>> mont29: 46149, 46155, 46341 >>> nazgul: 46027, 46028, 46039, 46140, 46143, 46148, 46157, 46178, 46227, >>> 46229, 46230, 46235, 46236, 46269 >>> nexyon: 46035, 46036, 46305 >>> psy-fi: 46228 >>> scourage: 46091 >>> >>> --- up until r46363 >>> >>> For original list see: >>> http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.63/Bug_Fixes#Fixes_since_2.63_.28for_bugfix_release.29 > ___ > Bf-committers mailing list > Bf-committers@blender.org > http://lists.blender.org/mailman/listinfo/bf-committers ___ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
