[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23654] trunk/blender/source/blender/ render: Some more compile fixes for jaguarandi's commit, this time for msvc+scons
Revision: 23654 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23654 Author: aligorith Date: 2009-10-06 12:23:25 +0200 (Tue, 06 Oct 2009) Log Message: --- Some more compile fixes for jaguarandi's commit, this time for msvc+scons * Replaced ... = {}; with ... = {0}; * Solved problem with logf(), where msvc couldn't figure out which version of log() to call (solved by casting the int argument to a float, but could also have been to double)... * The cflags and cxxflags for scons when compiling the rendering module were only valid for gcc compiles. These will still need to get added for msvc sometime, but for now, there are no more warnings about unknown options... Modified Paths: -- trunk/blender/source/blender/render/SConscript trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp trunk/blender/source/blender/render/intern/source/rayshade.c Modified: trunk/blender/source/blender/render/SConscript === --- trunk/blender/source/blender/render/SConscript 2009-10-06 04:37:25 UTC (rev 23653) +++ trunk/blender/source/blender/render/SConscript 2009-10-06 10:23:25 UTC (rev 23654) @@ -1,8 +1,14 @@ #!/usr/bin/python Import ('env') -cflags = ['-O2','-msse2','-mfpmath=sse'] -cxxflags = ['-O2','-msse2','-mfpmath=sse'] +if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): + # FIXME: need to set the appropriate flags for msvc, otherwise we get warnings + cflags = [] + cxxflags = [] +else: + cflags = ['-O2','-msse2','-mfpmath=sse'] + cxxflags = ['-O2','-msse2','-mfpmath=sse'] + sources = env.Glob('intern/source/*.c') raysources = env.Glob('intern/raytrace/*.cpp') Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp === --- trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2009-10-06 04:37:25 UTC (rev 23653) +++ trunk/blender/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2009-10-06 10:23:25 UTC (rev 23654) @@ -362,8 +362,8 @@ //Worst case heuristic (cost of each child is linear) float hcost, left_side, right_side; - left_side = bb_area(sweep_left.bb, sweep_left.bb+3)*(sweep_left.cost+logf(i)); - right_side= bb_area(sweep[i].bb, sweep[i].bb+3)*(sweep[i].cost+logf(size-i)); + left_side = bb_area(sweep_left.bb, sweep_left.bb+3)*(sweep_left.cost+logf((float)i)); + right_side= bb_area(sweep[i].bb, sweep[i].bb+3)*(sweep[i].cost+logf((float)size-i)); hcost = left_side+right_side; assert(left_side = 0); Modified: trunk/blender/source/blender/render/intern/source/rayshade.c === --- trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 04:37:25 UTC (rev 23653) +++ trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 10:23:25 UTC (rev 23654) @@ -134,7 +134,7 @@ } #ifdef RE_RAYCOUNTER -RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {}; +RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {0}; #endif @@ -180,7 +180,7 @@ #ifdef RE_RAYCOUNTER { - RayCounter sum = {}; + RayCounter sum = {0}; int i; for(i=0; iBLENDER_MAX_THREADS; i++) RE_RC_MERGE(sum, re_rc_counter+i); ___ 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 [23655] trunk/blender/source/blender/ render/intern: One last try - this should fix the remaining issues:
Revision: 23655 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23655 Author: aligorith Date: 2009-10-06 12:32:07 +0200 (Tue, 06 Oct 2009) Log Message: --- One last try - this should fix the remaining issues: * Made bvh_node_merge() in svbvh.h static (fix suggested by jaguarandi). This makes mingw link again. * Also, patched my previous fix for ... = {}; since mingw didn't like the other fix (which was for msvc). Modified Paths: -- trunk/blender/source/blender/render/intern/raytrace/svbvh.h trunk/blender/source/blender/render/intern/source/rayshade.c Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h === --- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 10:23:25 UTC (rev 23654) +++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 10:32:07 UTC (rev 23655) @@ -76,7 +76,7 @@ } template -void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) +static void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) { if(is_leaf(node)) { Modified: trunk/blender/source/blender/render/intern/source/rayshade.c === --- trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 10:23:25 UTC (rev 23654) +++ trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 10:32:07 UTC (rev 23655) @@ -134,7 +134,7 @@ } #ifdef RE_RAYCOUNTER -RayCounter re_rc_counter[BLENDER_MAX_THREADS] = {0}; +RayCounter re_rc_counter[BLENDER_MAX_THREADS]; #endif @@ -180,7 +180,7 @@ #ifdef RE_RAYCOUNTER { - RayCounter sum = {0}; + RayCounter sum; int i; for(i=0; iBLENDER_MAX_THREADS; i++) RE_RC_MERGE(sum, re_rc_counter+i); ___ 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 [23656] trunk/blender/source/blender/ render: *Added memset's to make sure counters start on zero
Revision: 23656 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23656 Author: jaguarandi Date: 2009-10-06 12:52:14 +0200 (Tue, 06 Oct 2009) Log Message: --- *Added memset's to make sure counters start on zero *Disabled ray counter (can be enabled on render/extern/include/RE_raytrace.h by commenting out the define) *marked bvh_node_merge() as static inline (hopping it now compiles on gcc and mingw) Modified Paths: -- trunk/blender/source/blender/render/extern/include/RE_raytrace.h trunk/blender/source/blender/render/intern/raytrace/bvh.h trunk/blender/source/blender/render/intern/raytrace/svbvh.h trunk/blender/source/blender/render/intern/source/rayshade.c Modified: trunk/blender/source/blender/render/extern/include/RE_raytrace.h === --- trunk/blender/source/blender/render/extern/include/RE_raytrace.h 2009-10-06 10:32:07 UTC (rev 23655) +++ trunk/blender/source/blender/render/extern/include/RE_raytrace.h 2009-10-06 10:52:14 UTC (rev 23656) @@ -35,7 +35,7 @@ extern C { #endif -#define RE_RAYCOUNTER /* enable counters per ray, usefull for measuring raytrace structures performance */ +// #define RE_RAYCOUNTER /* enable counters per ray, usefull for measuring raytrace structures performance */ #define RE_RAY_LCTS_MAX_SIZE 256 #define RT_USE_LAST_HIT/* last shadow hit is reused before raycasting on whole tree */ Modified: trunk/blender/source/blender/render/intern/raytrace/bvh.h === --- trunk/blender/source/blender/render/intern/raytrace/bvh.h 2009-10-06 10:32:07 UTC (rev 23655) +++ trunk/blender/source/blender/render/intern/raytrace/bvh.h 2009-10-06 10:52:14 UTC (rev 23656) @@ -112,7 +112,7 @@ templateclass Node -static void bvh_node_merge_bb(Node *node, float *min, float *max) +static inline void bvh_node_merge_bb(Node *node, float *min, float *max) { if(is_leaf(node)) { Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h === --- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 10:32:07 UTC (rev 23655) +++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 10:52:14 UTC (rev 23656) @@ -76,7 +76,7 @@ } template -static void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) +void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) { if(is_leaf(node)) { Modified: trunk/blender/source/blender/render/intern/source/rayshade.c === --- trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 10:32:07 UTC (rev 23655) +++ trunk/blender/source/blender/render/intern/source/rayshade.c 2009-10-06 10:52:14 UTC (rev 23656) @@ -181,6 +181,7 @@ #ifdef RE_RAYCOUNTER { RayCounter sum; + memset( sum, 0, sizeof(sum) ); int i; for(i=0; iBLENDER_MAX_THREADS; i++) RE_RC_MERGE(sum, re_rc_counter+i); @@ -444,8 +445,14 @@ re-i.infostr= Raytree finished; re-stats_draw(re-sdh, re-i); } + +#ifdef RE_RAYCOUNTER + memset( re_rc_counter, 0, sizeof(re_rc_counter) ); +#endif } + + void shade_ray(Isect *is, ShadeInput *shi, ShadeResult *shr) { ObjectInstanceRen *obi= (ObjectInstanceRen*)is-hit.ob; ___ 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 [23657] trunk/blender/source/blender/ editors/sculpt_paint/sculpt.c: sculpt was checking if multires was the last modifier,
Revision: 23657 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23657 Author: campbellbarton Date: 2009-10-06 13:21:57 +0200 (Tue, 06 Oct 2009) Log Message: --- sculpt was checking if multires was the last modifier, instead check if its the last displayed modifier Modified Paths: -- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c Modified: trunk/blender/source/blender/editors/sculpt_paint/sculpt.c === --- trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-06 10:52:14 UTC (rev 23656) +++ trunk/blender/source/blender/editors/sculpt_paint/sculpt.c 2009-10-06 11:21:57 UTC (rev 23657) @@ -1099,8 +1099,18 @@ ModifierData *md; for(md= modifiers_getVirtualModifierList(ob); md; md= md-next) { - if(md-type == eModifierType_Multires !md-next) { - MultiresModifierData *mmd = (MultiresModifierData*)md; + if(md-type == eModifierType_Multires) { + MultiresModifierData *mmd; + + /* Check if any of the modifiers after multires are active +* if not it can use the multires struct */ + ModifierData *md_next; + for (md_next= md-next; md_next; md_next= md_next-next) { + if(md_next-mode eModifierMode_Realtime) + return NULL; + } + + mmd = (MultiresModifierData*)md; if(mmd-lvl != 1) return mmd; } ___ 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 [23658] trunk/blender/source/blender: Bone Selections: Ability to set bones as unselectable
Revision: 23658 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23658 Author: aligorith Date: 2009-10-06 13:33:58 +0200 (Tue, 06 Oct 2009) Log Message: --- Bone Selections: Ability to set bones as unselectable In the Outliner, it is now possible to toggle per bone the selectability of the bone in the viewport, as for Objects using the restriction columns. This can also be set using the RNA-api. I've tested all commonly used tools IMO, but there may still be a few which I've missed. Please report those cases. PS. For some reason, the define was already there, but not connected up to anything. Can't remember why anymore, but here it is... Modified Paths: -- trunk/blender/source/blender/editors/armature/editarmature.c trunk/blender/source/blender/editors/armature/poseobject.c trunk/blender/source/blender/editors/object/object_select.c trunk/blender/source/blender/editors/space_outliner/outliner.c trunk/blender/source/blender/makesrna/intern/rna_armature.c Modified: trunk/blender/source/blender/editors/armature/editarmature.c === --- trunk/blender/source/blender/editors/armature/editarmature.c 2009-10-06 11:21:57 UTC (rev 23657) +++ trunk/blender/source/blender/editors/armature/editarmature.c 2009-10-06 11:33:58 UTC (rev 23658) @@ -110,17 +110,20 @@ EditBone *ebo; for (ebo=edbo-first; ebo; ebo= ebo-next) { - if ((ebo-flag BONE_CONNECTED) (ebo-parent)) { - if (ebo-parent-flag BONE_TIPSEL) - ebo-flag |= BONE_ROOTSEL; + /* if bone is not selectable, we shouldn't alter this setting... */ + if ((ebo-flag BONE_UNSELECTABLE) == 0) { + if ((ebo-flag BONE_CONNECTED) (ebo-parent)) { + if (ebo-parent-flag BONE_TIPSEL) + ebo-flag |= BONE_ROOTSEL; + else + ebo-flag = ~BONE_ROOTSEL; + } + + if ((ebo-flag BONE_TIPSEL) (ebo-flag BONE_ROOTSEL)) + ebo-flag |= BONE_SELECTED; else - ebo-flag = ~BONE_ROOTSEL; + ebo-flag = ~BONE_SELECTED; } - - if ((ebo-flag BONE_TIPSEL) (ebo-flag BONE_ROOTSEL)) - ebo-flag |= BONE_SELECTED; - else - ebo-flag = ~BONE_SELECTED; } } @@ -1127,7 +1130,7 @@ /* no singular posemode, so check for correct object */ if(base-selcol == (hitresult 0x)) { bone = get_indexed_bone(base-object, hitresult); - + if (findunsel) sel = (bone-flag BONE_SELECTED); else @@ -1347,45 +1350,42 @@ /* Posemode stuff ** */ -static void selectconnected_posebonechildren (Object *ob, Bone *bone) +static void selectconnected_posebonechildren (Object *ob, Bone *bone, int extend) { Bone *curBone; - int shift= 0; // XXX - if (!(bone-flag BONE_CONNECTED)) + /* stop when unconnected child is encontered, or when unselectable bone is encountered */ + if (!(bone-flag BONE_CONNECTED) || (bone-flag BONE_UNSELECTABLE)) return; // XXX old cruft! use notifiers instead //select_actionchannel_by_name (ob-action, bone-name, !(shift)); - if (shift) + if (extend) bone-flag = ~BONE_SELECTED; else bone-flag |= BONE_SELECTED; - for (curBone=bone-childbase.first; curBone; curBone=curBone-next){ - selectconnected_posebonechildren (ob, curBone); - } + for (curBone=bone-childbase.first; curBone; curBone=curBone-next) + selectconnected_posebonechildren(ob, curBone, extend); } /* within active object context */ /* previously known as selectconnected_posearmature */ static int pose_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *event) { + ARegion *ar= CTX_wm_region(C); + Object *ob= CTX_data_edit_object(C); Bone *bone, *curBone, *next= NULL; - int shift= 0; // XXX in pose mode, Shift+L is bound to another command - // named PoseLib Add Current Pose + int extend= RNA_boolean_get(op-ptr, extend);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23659] trunk/blender/source/blender/ render/intern/raytrace/svbvh.h: Last fix still failed to link under mingw.
Revision: 23659 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23659 Author: jaguarandi Date: 2009-10-06 14:23:25 +0200 (Tue, 06 Oct 2009) Log Message: --- Last fix still failed to link under mingw. This time it works! (gcc and mingw can handle compile and link) Modified Paths: -- trunk/blender/source/blender/render/intern/raytrace/svbvh.h Modified: trunk/blender/source/blender/render/intern/raytrace/svbvh.h === --- trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 11:33:58 UTC (rev 23658) +++ trunk/blender/source/blender/render/intern/raytrace/svbvh.h 2009-10-06 12:23:25 UTC (rev 23659) @@ -76,7 +76,7 @@ } template -void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) +inline void bvh_node_merge_bbSVBVHNode(SVBVHNode *node, float *min, float *max) { if(is_leaf(node)) { ___ 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 [23660] trunk/blender/source/blender: new operator - bpy.ops.wm.call_menu(name=SOME_MT_menu)
Revision: 23660 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23660 Author: campbellbarton Date: 2009-10-06 15:04:31 +0200 (Tue, 06 Oct 2009) Log Message: --- new operator - bpy.ops.wm.call_menu(name=SOME_MT_menu) This calls a registered menu as a popup so we can reuse header menus , currently used for Node editor and Sequencer add menu (Shift+A), can be used for toolbox too. Modified Paths: -- trunk/blender/source/blender/blenkernel/BKE_screen.h trunk/blender/source/blender/blenkernel/intern/screen.c trunk/blender/source/blender/editors/include/UI_interface.h trunk/blender/source/blender/editors/interface/interface_layout.c trunk/blender/source/blender/editors/interface/interface_regions.c trunk/blender/source/blender/editors/space_node/node_ops.c trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c trunk/blender/source/blender/makesdna/DNA_space_types.h trunk/blender/source/blender/makesrna/intern/rna_ui.c trunk/blender/source/blender/windowmanager/intern/wm_operators.c Modified: trunk/blender/source/blender/blenkernel/BKE_screen.h === --- trunk/blender/source/blender/blenkernel/BKE_screen.h2009-10-06 12:23:25 UTC (rev 23659) +++ trunk/blender/source/blender/blenkernel/BKE_screen.h2009-10-06 13:04:31 UTC (rev 23660) @@ -222,6 +222,8 @@ void BKE_spacetype_register(struct SpaceType *st); void BKE_spacetypes_free(void);/* only for quitting blender */ +MenuType *BKE_spacemenu_find(const char *idname, int spacetype); + /* spacedata */ void BKE_spacedata_freelist(ListBase *lb); void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2); Modified: trunk/blender/source/blender/blenkernel/intern/screen.c === --- trunk/blender/source/blender/blenkernel/intern/screen.c 2009-10-06 12:23:25 UTC (rev 23659) +++ trunk/blender/source/blender/blenkernel/intern/screen.c 2009-10-06 13:04:31 UTC (rev 23660) @@ -343,3 +343,25 @@ return layer; } +MenuType *BKE_spacemenu_find(const char *idname, int spacetype) +{ + SpaceType *st= BKE_spacetype_from_id(spacetype); + ARegionType *art; + MenuType* mt; + + if(st==NULL) { + printf(space type %d is invalid\n, spacetype); + return NULL; + } + + if(idname==NULL) + return NULL; + + for(art= st-regiontypes.first; art; art= art-next) + for(mt=art-menutypes.first; mt; mt=mt-next) + if(strcmp(idname, mt-idname)==0) + return mt; + + return NULL; +} + Modified: trunk/blender/source/blender/editors/include/UI_interface.h === --- trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-06 12:23:25 UTC (rev 23659) +++ trunk/blender/source/blender/editors/include/UI_interface.h 2009-10-06 13:04:31 UTC (rev 23660) @@ -256,6 +256,7 @@ void uiPupMenuNotice(struct bContext *C, char *str, ...); void uiPupMenuError(struct bContext *C, char *str, ...); void uiPupMenuReports(struct bContext *C, struct ReportList *reports); +void uiPupMenuInvoke(struct bContext *C, const char *idname, int spacetype); /* popup registered menu */ /* Popup Blocks * Modified: trunk/blender/source/blender/editors/interface/interface_layout.c === --- trunk/blender/source/blender/editors/interface/interface_layout.c 2009-10-06 12:23:25 UTC (rev 23659) +++ trunk/blender/source/blender/editors/interface/interface_layout.c 2009-10-06 13:04:31 UTC (rev 23660) @@ -1202,24 +1202,21 @@ void uiItemM(uiLayout *layout, bContext *C, char *name, int icon, char *menuname) { - ARegion *ar= CTX_wm_region(C); MenuType *mt; - if(!menuname) - return; + mt= BKE_spacemenu_find(menuname, CTX_wm_area(C)-spacetype); - for(mt=ar-type-menutypes.first; mt; mt=mt-next) { - if(strcmp(menuname, mt-idname) == 0) { - if(!name) - name= mt-label; - if(layout-root-type == UI_LAYOUT_MENU !icon) - icon= ICON_BLANK1; - ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL); - return; - } + if(mt==NULL) { + printf(uiItemM: not found %s\n, menuname); + return; } - printf(uiItemM: not found %s\n, menuname); + if(!name) + name= mt-label; + if(layout-root-type == UI_LAYOUT_MENU !icon) + icon= ICON_BLANK1; + + ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL); } /* label item */ Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23661] trunk/blender/source/blender/ editors/interface/interface_regions.c: * Remember, C-style declarations at the *beginning* of a scope, not C++ s
Revision: 23661 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23661 Author: jesterking Date: 2009-10-06 16:09:40 +0200 (Tue, 06 Oct 2009) Log Message: --- * Remember, C-style declarations at the *beginning* of a scope, not C++ style wherever one pleases (before first usage). Modified Paths: -- trunk/blender/source/blender/editors/interface/interface_regions.c Modified: trunk/blender/source/blender/editors/interface/interface_regions.c === --- trunk/blender/source/blender/editors/interface/interface_regions.c 2009-10-06 13:04:31 UTC (rev 23660) +++ trunk/blender/source/blender/editors/interface/interface_regions.c 2009-10-06 14:09:40 UTC (rev 23661) @@ -2485,6 +2485,7 @@ { uiPopupMenu *pup; uiLayout *layout; + Menu menu; MenuType *mt= BKE_spacemenu_find(idname, spacetype); if(mt==NULL) { @@ -2498,8 +2499,6 @@ pup= uiPupMenuBegin(C, mt-label, 0); layout= uiPupMenuLayout(pup); - Menu menu; - menu.layout= layout; menu.type= mt; ___ 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 [23662] trunk/blender/SConstruct: * copying of python31.zip and zlip.pyd is not necessary anymore, since the zip is unpacked by default to .blender/py
Revision: 23662 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23662 Author: jesterking Date: 2009-10-06 16:25:55 +0200 (Tue, 06 Oct 2009) Log Message: --- * copying of python31.zip and zlip.pyd is not necessary anymore, since the zip is unpacked by default to .blender/python/lib Modified Paths: -- trunk/blender/SConstruct Modified: trunk/blender/SConstruct === --- trunk/blender/SConstruct2009-10-06 14:09:40 UTC (rev 23661) +++ trunk/blender/SConstruct2009-10-06 14:25:55 UTC (rev 23662) @@ -578,10 +578,6 @@ else: dllsources.append('${BF_SDL_LIBPATH}/SDL.dll') if env['WITH_BF_PYTHON']: - ver = env[BF_PYTHON_VERSION].replace(., ) - - dllsources.append('${LCGDIR}/release/python' + ver + '.zip') - dllsources.append('${LCGDIR}/release/zlib.pyd') if env['BF_DEBUG']: dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll') else: ___ 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 [23663] trunk/blender/tools/Blender.py: == SCons ==
Revision: 23663 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23663 Author: jesterking Date: 2009-10-06 17:01:46 +0200 (Tue, 06 Oct 2009) Log Message: --- == SCons == * Unzip of python31.zip now works also for Python 2.5. Patch by b333rt (thanks again!) Modified Paths: -- trunk/blender/tools/Blender.py Modified: trunk/blender/tools/Blender.py === --- trunk/blender/tools/Blender.py 2009-10-06 14:25:55 UTC (rev 23662) +++ trunk/blender/tools/Blender.py 2009-10-06 15:01:46 UTC (rev 23663) @@ -20,6 +20,9 @@ import glob import time import sys +import zipfile +import shutil +import cStringIO from SCons.Script.SConscript import SConsEnvironment import SCons.Action @@ -327,11 +330,80 @@ env['BUILDERS']['Library'] = static_lib env['BUILDERS']['Program'] = program + +class CompZipFile(zipfile.ZipFile): + Partial copy of python2.6's zipfile.ZipFile (see http://www.python.org) + to get a extractall() that works on py2.5 and probably earlier distributions. + def __init__(self, file, mode=r, compression=zipfile.ZIP_STORED, allowZip64=False): + zipfile.ZipFile.__init__(self, file, mode, compression, allowZip64) + if not hasattr(self,extractall): # use our method + print Debug: Using comp_extractall! + self.extractall= self.comp_extractall + def comp_extractall(self, path=None, members=None, pwd=None): #renamed method + Extract all members from the archive to the current working + directory. `path' specifies a different directory to extract to. + `members' is optional and must be a subset of the list returned + by namelist(). + + if members is None: + members = self.namelist() + + for zipinfo in members: + self.comp_extract(zipinfo, path, pwd) # use our method + + def comp_extract(self, member, path=None, pwd=None): #renamed method + Extract a member from the archive to the current working directory, + using its full name. Its file information is extracted as accurately + as possible. `member' may be a filename or a ZipInfo object. You can + specify a different directory using `path'. + + if not isinstance(member, zipfile.ZipInfo): + member = self.getinfo(member) + + if path is None: + path = os.getcwd() + + return self.comp_extract_member(member, path, pwd) # use our method + + def comp_extract_member(self, member, targetpath, pwd): #renamed method + Extract the ZipInfo object 'member' to a physical + file on the path targetpath. + + # build the destination pathname, replacing + # forward slashes to platform specific separators. + if targetpath[-1:] in (os.path.sep, os.path.altsep): + targetpath = targetpath[:-1] + + # don't include leading / from file name if present + if member.filename[0] == '/': + targetpath = os.path.join(targetpath, member.filename[1:]) + else: + targetpath = os.path.join(targetpath, member.filename) + + targetpath = os.path.normpath(targetpath) + + # Create all upper directories if necessary. + upperdirs = os.path.dirname(targetpath) + if upperdirs and not os.path.exists(upperdirs): + os.makedirs(upperdirs) + + if member.filename[-1] == '/': + os.mkdir(targetpath) + return targetpath + + #use StrinIO instead so we don't have to reproduce more functionality. + source = cStringIO.StringIO(self.read(member.filename)) + target = file(targetpath, wb) + shutil.copyfileobj(source, target) + source.close() + target.close() + + return targetpath + def unzip_pybundle(from_zip,to_dir,exclude_re): - import zipfile - zip= zipfile.ZipFile(from_zip, mode='r') + zip= CompZipFile(from_zip, mode='r') exclude_re= list(exclude_re) #single re object or list of re objects debug= 0 #list files instead of unpacking good= [] @@ -356,7 +428,7 @@ pass def WinPyBundle(target=None, source=None, env=None): - import shutil, re + import re py_zip= env.subst( env['LCGDIR'] ) if py_zip[0]=='#': py_zip= py_zip[1:]
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23664] trunk/blender: Material buttons now view the active node material shading settings.
Revision: 23664 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23664 Author: campbellbarton Date: 2009-10-06 17:31:25 +0200 (Tue, 06 Oct 2009) Log Message: --- Material buttons now view the active node material shading settings. Selecting a material in the node tree sets this as the active material and the buttons view redraws. Added rna prop material.active_node_material Currently its not clear what settings are used by the node material and the base material (needs some tedious research) so I made most panels use the node material with the exceptions of volumetrics, physics and halo settings. We'll probably need to split the panels up to do this properly. Modified Paths: -- trunk/blender/release/scripts/ui/buttons_material.py trunk/blender/source/blender/blenkernel/BKE_node.h trunk/blender/source/blender/blenkernel/intern/node.c trunk/blender/source/blender/editors/sculpt_paint/sculpt.c trunk/blender/source/blender/editors/space_node/node_select.c trunk/blender/source/blender/makesrna/intern/rna_material.c Modified: trunk/blender/release/scripts/ui/buttons_material.py === --- trunk/blender/release/scripts/ui/buttons_material.py2009-10-06 15:01:46 UTC (rev 23663) +++ trunk/blender/release/scripts/ui/buttons_material.py2009-10-06 15:31:25 UTC (rev 23664) @@ -1,6 +1,17 @@ import bpy +def active_node_mat(mat): + # TODO, 2.4x has a pipeline section, for 2.5 we need to communicate + # which settings from node-materials are used + if mat: + mat_node = mat.active_node_material + if mat_node: + return mat_node + + return None + + class MaterialButtonsPanel(bpy.types.Panel): __space_type__ = 'PROPERTIES' __region_type__ = 'WINDOW' @@ -74,14 +85,14 @@ COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): - mat = context.material + mat = active_node_mat(context.material) engine = context.scene.render_data.engine return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout - mat = context.material + mat = active_node_mat(context.material) if mat.type in ('SURFACE', 'WIRE'): split = layout.split() @@ -117,7 +128,7 @@ def draw(self, context): layout = self.layout - mat = context.material + mat = context.material # dont use node material tan = mat.strand split = layout.split() @@ -152,7 +163,7 @@ def draw(self, context): layout = self.layout - phys = context.material.physics + phys = context.material.physics # dont use node material split = layout.split() @@ -171,14 +182,14 @@ COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): - mat = context.material + mat = active_node_mat(context.material) engine = context.scene.render_data.engine return mat and (mat.type in ('SURFACE', 'WIRE', 'HALO')) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout - mat = context.material + mat = active_node_mat(context.material) split = layout.split() @@ -211,14 +222,14 @@ COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): - mat = context.material + mat = active_node_mat(context.material) engine = context.scene.render_data.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout - mat = context.material + mat = active_node_mat(context.material) split = layout.split() @@ -244,14 +255,14 @@ COMPAT_ENGINES = set(['BLENDER_RENDER', 'BLENDER_GAME']) def poll(self, context): - mat = context.material + mat = active_node_mat(context.material) engine = context.scene.render_data.engine return mat and (mat.type in ('SURFACE', 'WIRE')) and (engine in self.COMPAT_ENGINES) def draw(self, context): layout = self.layout - mat =
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23665] trunk/blender: Cocoa port : First pure Cocoa version !
Revision: 23665 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23665 Author: damien78 Date: 2009-10-06 18:56:22 +0200 (Tue, 06 Oct 2009) Log Message: --- Cocoa port : First pure Cocoa version ! (Mostly for very early testers) Cocoa uses coordinates with y=0 at bottom : updated wm_window.c and wm_event_system.c for COCOA build to avoid double conversions in response to mouse move events and GHOST_getCursorPosition Known limitations: No fullscreen support Font issue in preference panel libSDL uses some Carbon functions Modified Paths: -- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.h trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm trunk/blender/source/blender/windowmanager/intern/wm_event_system.c trunk/blender/source/blender/windowmanager/intern/wm_window.c Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.h === --- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.h 2009-10-06 15:31:25 UTC (rev 23664) +++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.h 2009-10-06 16:56:22 UTC (rev 23665) @@ -46,6 +46,7 @@ class GHOST_EventCursor; class GHOST_EventKey; class GHOST_EventWindow; +class GHOST_WindowCocoa; class GHOST_SystemCocoa : public GHOST_System { @@ -191,6 +192,13 @@ */ virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const; + /** + * Handles a window event. Called by GHOST_WindowCocoa window delegate + * @param eventPtr An NSEvent pointer (casted to void* to enable compilation in standard C++) + * @return Indication whether the event was handled. + */ +GHOST_TSuccess handleWindowEvent(GHOST_TEventType eventType, GHOST_WindowCocoa* window); + protected: /** * Initializes the system. @@ -220,13 +228,6 @@ */ GHOST_TSuccess handleKeyEvent(void *eventPtr); - /** - * Handles a window event. - * @param eventPtr An NSEvent pointer (casted to void* to enable compilation in standard C++) - * @return Indication whether the event was handled. - */ -GHOST_TSuccess handleWindowEvent(void *eventPtr); - /** * Handles all basic Mac application stuff for a mouse down event. * @param eventPtr An NSEvent pointer (casted to void* to enable compilation in standard C++) @@ -250,10 +251,7 @@ * @param tmTask Pointer to the timer task that expired. */ //static void s_timerCallback(TMTaskPtr tmTask); - - /** Cocoa autoReleasePool (void*) used for enablign standard C++ compilation */ - void* m_autoReleasePool; - + /** Event handler reference. */ //EventHandlerRef m_handler; Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm === --- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-06 15:31:25 UTC (rev 23664) +++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-06 16:56:22 UTC (rev 23665) @@ -89,7 +89,157 @@ };*/ -static GHOST_TButtonMask convertButton(EventMouseButton button) +/* Keycodes from Carbon include file */ +/* + * Summary: + *Virtual keycodes + * + * Discussion: + *These constants are the virtual keycodes defined originally in + *Inside Mac Volume V, pg. V-191. They identify physical keys on a + *keyboard. Those constants with ANSI in the name are labeled + *according to the key position on an ANSI-standard US keyboard. + *For example, kVK_ANSI_A indicates the virtual keycode for the key + *with the letter 'A' in the US keyboard layout. Other keyboard + *layouts may have the 'A' key label on a different physical key; + *in this case, pressing 'A' will generate a different virtual + *keycode. + */ +enum { + kVK_ANSI_A= 0x00, + kVK_ANSI_S= 0x01, + kVK_ANSI_D= 0x02, + kVK_ANSI_F= 0x03, + kVK_ANSI_H= 0x04, + kVK_ANSI_G= 0x05, + kVK_ANSI_Z= 0x06, + kVK_ANSI_X= 0x07, + kVK_ANSI_C= 0x08, + kVK_ANSI_V= 0x09, + kVK_ANSI_B= 0x0B, + kVK_ANSI_Q= 0x0C, + kVK_ANSI_W= 0x0D, + kVK_ANSI_E= 0x0E, + kVK_ANSI_R= 0x0F, + kVK_ANSI_Y= 0x10, + kVK_ANSI_T= 0x11, + kVK_ANSI_1= 0x12, + kVK_ANSI_2= 0x13, + kVK_ANSI_3= 0x14, +
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23666] trunk/blender/source: Add raytrace subdir to Makefiles.
Revision: 23666 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23666 Author: gsrb3d Date: 2009-10-06 19:01:00 +0200 (Tue, 06 Oct 2009) Log Message: --- Add raytrace subdir to Makefiles. The makefile is a copy of the source one, not tuned, just to unbreak build. This raises some questions: why separate dirs? why each build system takes a different approach (different libs vs all source files into one)? Modified Paths: -- trunk/blender/source/Makefile Added Paths: --- trunk/blender/source/blender/render/intern/raytrace/Makefile Modified: trunk/blender/source/Makefile === --- trunk/blender/source/Makefile 2009-10-06 16:56:22 UTC (rev 23665) +++ trunk/blender/source/Makefile 2009-10-06 17:01:00 UTC (rev 23666) @@ -83,6 +83,7 @@ GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a +GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender_raytrace.a # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some Added: trunk/blender/source/blender/render/intern/raytrace/Makefile === --- trunk/blender/source/blender/render/intern/raytrace/Makefile (rev 0) +++ trunk/blender/source/blender/render/intern/raytrace/Makefile 2009-10-06 17:01:00 UTC (rev 23666) @@ -0,0 +1,65 @@ +# +# $Id$ +# +# * BEGIN GPL LICENSE BLOCK * +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): none yet. +# +# * END GPL LICENSE BLOCK * +# +# + +LIBNAME = render_raytrace +DIR = $(OCGDIR)/blender/render + +include nan_compile.mk + +CFLAGS += $(LEVEL_1_C_WARNINGS) + +# first /include is my own includes, second is the external interface. +# The external modules follow after. There should be a nicer way to say this. +CPPFLAGS += -I../include +CPPFLAGS += -I../../extern/include +CPPFLAGS += -I../../../blenlib +CPPFLAGS += -I../../../imbuf +CPPFLAGS += -I../../../makesdna +CPPFLAGS += -I../../../makesrna +CPPFLAGS += -I../../../blenkernel +CPPFLAGS += -I../../../quicktime +CPPFLAGS += -I../../../../kernel/gen_messaging +CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include +# not very neat: the rest of blender.. +CPPFLAGS += -I../../../editors/include +CPPFLAGS += $(NAN_SDLCFLAGS) +CPPFLAGS += -I../../../../../intern/smoke/extern + +ifeq ($(WITH_QUICKTIME), true) +CPPFLAGS += -DWITH_QUICKTIME +endif + +ifeq ($(WITH_FFMPEG),true) +CPPFLAGS += -DWITH_FFMPEG +endif + +ifeq ($(WITH_OPENEXR),true) +CPPFLAGS += -DWITH_OPENEXR +endif Property changes on: trunk/blender/source/blender/render/intern/raytrace/Makefile ___ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native ___ 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 [23667] trunk/blender/source/blender/ makesrna/intern/rna_constraint.c: Bugfix: IK constraint pole angle range was not correct.
Revision: 23667 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23667 Author: blendix Date: 2009-10-06 19:15:10 +0200 (Tue, 06 Oct 2009) Log Message: --- Bugfix: IK constraint pole angle range was not correct. Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_constraint.c Modified: trunk/blender/source/blender/makesrna/intern/rna_constraint.c === --- trunk/blender/source/blender/makesrna/intern/rna_constraint.c 2009-10-06 17:01:00 UTC (rev 23666) +++ trunk/blender/source/blender/makesrna/intern/rna_constraint.c 2009-10-06 17:15:10 UTC (rev 23667) @@ -87,7 +87,7 @@ {0, NULL, 0, NULL, NULL}, }; -static EnumPropertyItem constraint_distance_items[] = { +EnumPropertyItem constraint_distance_items[] = { {LIMITDIST_INSIDE, LIMITDIST_INSIDE, 0, Inside, }, {LIMITDIST_OUTSIDE, LIMITDIST_OUTSIDE, 0, Outside, }, {LIMITDIST_ONSURFACE, LIMITDIST_ONSURFACE, 0, On Surface, }, @@ -453,7 +453,7 @@ prop= RNA_def_property(srna, pole_angle, PROP_FLOAT, PROP_ANGLE); // XXX - todo, convert to rad RNA_def_property_float_sdna(prop, NULL, poleangle); - RNA_def_property_range(prop, 0.0, 180.f); + RNA_def_property_range(prop, -180.0f, 180.f); RNA_def_property_ui_text(prop, Pole Angle, Pole rotation offset.); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, rna_Constraint_update); ___ 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 [23668] trunk/blender/release/scripts/ui/ buttons_material.py: mistake in last commit
Revision: 23668 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23668 Author: campbellbarton Date: 2009-10-06 22:00:23 +0200 (Tue, 06 Oct 2009) Log Message: --- mistake in last commit Modified Paths: -- trunk/blender/release/scripts/ui/buttons_material.py Modified: trunk/blender/release/scripts/ui/buttons_material.py === --- trunk/blender/release/scripts/ui/buttons_material.py2009-10-06 17:15:10 UTC (rev 23667) +++ trunk/blender/release/scripts/ui/buttons_material.py2009-10-06 20:00:23 UTC (rev 23668) @@ -8,6 +8,8 @@ mat_node = mat.active_node_material if mat_node: return mat_node + else: + return mat return None ___ 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 [23671] trunk/blender/source/blender/ render/intern/source/volumetric.c: * Fix for crash with new raytree
Revision: 23671 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23671 Author: broken Date: 2009-10-07 01:05:53 +0200 (Wed, 07 Oct 2009) Log Message: --- * Fix for crash with new raytree Modified Paths: -- trunk/blender/source/blender/render/intern/source/volumetric.c Modified: trunk/blender/source/blender/render/intern/source/volumetric.c === --- trunk/blender/source/blender/render/intern/source/volumetric.c 2009-10-06 21:28:45 UTC (rev 23670) +++ trunk/blender/source/blender/render/intern/source/volumetric.c 2009-10-06 23:05:53 UTC (rev 23671) @@ -139,12 +139,16 @@ */ isect-mode= RE_RAY_MIRROR; - isect-orig.ob = (void*)shi-obi; isect-last_hit = NULL; isect-lay= -1; - if (intersect_type == VOL_BOUNDS_DEPTH) isect-orig.face = (void*)shi-vlr; - else if (intersect_type == VOL_BOUNDS_SS) isect-orig.face= NULL; + if (intersect_type == VOL_BOUNDS_DEPTH) { + isect-orig.face = (void*)shi-vlr; + isect-orig.ob = (void*)shi-obi; + } else if (intersect_type == VOL_BOUNDS_SS) { + isect-orig.face= NULL; + isect-orig.ob = NULL; + } if(RE_rayobject_raycast(R.raytree, isect)) { ___ 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 [23672] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: * Fix for previous ' set object as camera' operator - now properly sets the
Revision: 23672 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23672 Author: broken Date: 2009-10-07 01:13:07 +0200 (Wed, 07 Oct 2009) Log Message: --- * Fix for previous 'set object as camera' operator - now properly sets the scene active camera too, plus better notifier. Modified Paths: -- trunk/blender/source/blender/editors/space_view3d/view3d_view.c Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-10-06 23:05:53 UTC (rev 23671) +++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-10-06 23:13:07 UTC (rev 23672) @@ -443,10 +443,12 @@ if(BASACT) { rv3d-persp= V3D_CAMOB; v3d-camera= OBACT; + if(v3d-scenelock) + scene-camera= OBACT; smooth_view(C, NULL, v3d-camera, rv3d-ofs, rv3d-viewquat, rv3d-dist, v3d-lens); } - WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, CTX_data_scene(C)); + WM_event_add_notifier(C, NC_SCENE|ND_RENDER_OPTIONS|NC_OBJECT|ND_DRAW, CTX_data_scene(C)); return OPERATOR_FINISHED; } ___ 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 [23673] trunk/blender/source/blender/ makesrna/intern/rna_lamp.c: * notifier fix to redraw upon changing lamp shadow type
Revision: 23673 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23673 Author: broken Date: 2009-10-07 01:37:11 +0200 (Wed, 07 Oct 2009) Log Message: --- * notifier fix to redraw upon changing lamp shadow type Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_lamp.c Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c === --- trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-10-06 23:13:07 UTC (rev 23672) +++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c 2009-10-06 23:37:11 UTC (rev 23673) @@ -456,7 +456,7 @@ RNA_def_property_enum_bitflag_sdna(prop, NULL, mode); RNA_def_property_enum_items(prop, (spot)? prop_spot_shadow_items: prop_shadow_items); RNA_def_property_ui_text(prop, Shadow Method, Method to compute lamp shadow with.); - RNA_def_property_update(prop, 0, rna_Lamp_update); + RNA_def_property_update(prop, 0, rna_Lamp_draw_update); prop= RNA_def_property(srna, shadow_color, PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, shdwr); ___ 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 [23675] branches/soc-2008-mxcurioni: merged changed to revision 23673
Revision: 23675 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23675 Author: mxcurioni Date: 2009-10-07 05:47:36 +0200 (Wed, 07 Oct 2009) Log Message: --- merged changed to revision 23673 Revision Links: -- http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23673 Modified Paths: -- branches/soc-2008-mxcurioni/SConstruct branches/soc-2008-mxcurioni/config/win64-vc-config.py branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ops.py branches/soc-2008-mxcurioni/release/scripts/ui/buttons_material.py branches/soc-2008-mxcurioni/release/scripts/ui/buttons_particle.py branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_common.py branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py branches/soc-2008-mxcurioni/release/scripts/ui/buttons_texture.py branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py branches/soc-2008-mxcurioni/source/Makefile branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23676] trunk/blender/source/blender/ editors/screen/screen_ops.c: * Add numpad enter as an alternative key to confirm/execute file browser
Revision: 23676 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23676 Author: broken Date: 2009-10-07 07:13:31 +0200 (Wed, 07 Oct 2009) Log Message: --- * Add numpad enter as an alternative key to confirm/execute file browser Modified Paths: -- trunk/blender/source/blender/editors/screen/screen_ops.c Modified: trunk/blender/source/blender/editors/screen/screen_ops.c === --- trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-07 03:47:36 UTC (rev 23675) +++ trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-07 05:13:31 UTC (rev 23676) @@ -3330,6 +3330,7 @@ /* files */ WM_keymap_add_item(keymap, FILE_OT_execute, RETKEY, KM_PRESS, 0, 0); + WM_keymap_add_item(keymap, FILE_OT_execute, PADENTER, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, FILE_OT_cancel, ESCKEY, KM_PRESS, 0, 0); /* undo */ ___ 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 [23677] branches/soc-2008-mxcurioni: committed Tamito Kajiyama' s RNA and GUI patch for Freestyle integration into Blender 2.5.
Revision: 23677 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23677 Author: mxcurioni Date: 2009-10-07 07:16:23 +0200 (Wed, 07 Oct 2009) Log Message: --- committed Tamito Kajiyama's RNA and GUI patch for Freestyle integration into Blender 2.5. As of I right now, Freestyle is back in the UI, but rendering still fails because of the texture manager. Modified Paths: -- branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt branches/soc-2008-mxcurioni/source/blender/editors/render/SConscript branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.c branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_freestyle_types.h branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c Modified: branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py === --- branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py 2009-10-07 05:13:31 UTC (rev 23676) +++ branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py 2009-10-07 05:16:23 UTC (rev 23677) @@ -80,11 +80,12 @@ col.itemR(rl, solid) col.itemR(rl, halo) col.itemR(rl, ztransp) + col.itemR(rl, sky) col = split.column() - col.itemR(rl, sky) col.itemR(rl, edge) col.itemR(rl, strand) + col.itemR(rl, freestyle) if rl.zmask: split = layout.split() @@ -125,6 +126,33 @@ row.itemR(rl, pass_refraction) row.itemR(rl, pass_refraction_exclude, text=, icon='ICON_X') + if rl.freestyle: + layout.itemS() + + split = layout.split() + + col = split.column() + col.itemL(text=Freestyle:) + freestyle = rl.freestyle_settings + col.itemR(freestyle, sphere_radius, text=Sphere Radius) + col.itemR(freestyle, ridges_and_valleys, text=Ridges and Valleys) + col.itemR(freestyle, suggestive_contours, text=Suggestive Contours) + col.itemR(freestyle, dkr_epsilon, text=Dkr Epsilon) + + col.itemO(scene.freestyle_module_add, text=Add Style Module) + + for i, module in enumerate(freestyle.modules): + box = layout.box() + box.set_context_pointer(freestyle_module, module) + row = box.row(align=True) + row.itemR(module, is_displayed, text=) + row.itemR(module, module_path, text=) + row.itemO(scene.freestyle_module_remove, icon='ICON_X', text=) + props = row.itemO(scene.freestyle_module_move_up, icon='VICON_MOVE_UP', text=, properties=True) + props.active = (i 0) + props = row.itemO(scene.freestyle_module_move_down, icon='VICON_MOVE_DOWN', text=, properties=True) + props.active = (i len(freestyle.modules) - 1) + class SCENE_PT_shading(RenderButtonsPanel): __label__ = Shading COMPAT_ENGINES = set(['BLENDER_RENDER']) @@ -224,6 +252,13 @@ sub.itemR(rd, edge_threshold, text=Threshold, slider=True) sub.itemR(rd, edge_color, text=) + layout.itemS() + + split = layout.split() + col = split.column() + col.itemR(rd, freestyle, text=Freestyle) + + class SCENE_PT_output(RenderButtonsPanel): __label__ = Output COMPAT_ENGINES = set(['BLENDER_RENDER']) Modified: branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt === --- branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt 2009-10-07 05:13:31 UTC (rev 23676) +++ branches/soc-2008-mxcurioni/source/blender/editors/CMakeLists.txt 2009-10-07 05:16:23 UTC (rev 23677) @@ -39,6 +39,7 @@ ../../../intern/audaspace/intern ../nodes ../gpu + ../freestyle ../blenfont ../ikplugin ) Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23678] trunk/blender/source/blender/ makesrna/intern/rna_material.c: own warnings added last commit
Revision: 23678 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=23678 Author: campbellbarton Date: 2009-10-07 07:26:13 +0200 (Wed, 07 Oct 2009) Log Message: --- own warnings added last commit Modified Paths: -- trunk/blender/source/blender/makesrna/intern/rna_material.c Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c === --- trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-07 05:16:23 UTC (rev 23677) +++ trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-07 05:26:13 UTC (rev 23678) @@ -59,6 +59,7 @@ #include BKE_depsgraph.h #include BKE_main.h #include BKE_texture.h +#include BKE_node.h #include ED_node.h @@ -176,7 +177,7 @@ Material *ma= (Material*)ptr-data; Material *ma_act= value.data; - nodeSetActiveID(ma-nodetree, ID_MA, ma_act); + nodeSetActiveID(ma-nodetree, ID_MA, ma_act-id); } static void rna_MaterialStrand_start_size_range(PointerRNA *ptr, float *min, float *max) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs