Revision: 38964 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38964 Author: campbellbarton Date: 2011-08-03 05:32:07 +0000 (Wed, 03 Aug 2011) Log Message: ----------- fix [#28151] export OBJ don't save the extension also correct some typos
Modified Paths: -------------- trunk/blender/doc/python_api/blender-org/static/default.css_t trunk/blender/release/scripts/modules/bpy_extras/io_utils.py trunk/blender/source/blender/editors/space_view3d/view3d_view.c trunk/blender/source/blender/render/intern/source/rendercore.c Modified: trunk/blender/doc/python_api/blender-org/static/default.css_t =================================================================== --- trunk/blender/doc/python_api/blender-org/static/default.css_t 2011-08-03 05:01:55 UTC (rev 38963) +++ trunk/blender/doc/python_api/blender-org/static/default.css_t 2011-08-03 05:32:07 UTC (rev 38964) @@ -219,7 +219,7 @@ } {%- if theme_stickysidebar|tobool %} -/* this is nice, but it it leads to hidden headings when jumping +/* this is nice, but it leads to hidden headings when jumping to an anchor */ /* div.related { Modified: trunk/blender/release/scripts/modules/bpy_extras/io_utils.py =================================================================== --- trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2011-08-03 05:01:55 UTC (rev 38963) +++ trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2011-08-03 05:32:07 UTC (rev 38964) @@ -37,6 +37,15 @@ from bpy.props import StringProperty, BoolProperty, EnumProperty +def _check_axis_conversion(op): + if hasattr(op, "axis_forward") and hasattr(op, "axis_up"): + return axis_conversion_ensure(op, + "axis_forward", + "axis_up", + ) + return False + + class ExportHelper: filepath = StringProperty( name="File Path", @@ -70,23 +79,24 @@ return {'RUNNING_MODAL'} def check(self, context): + change_ext = False + change_axis = _check_axis_conversion(self) + check_extension = self.check_extension - if check_extension is None: - return False + if check_extension is not None: + filepath = bpy.path.ensure_ext(self.filepath, + self.filename_ext + if check_extension + else "") - filepath = bpy.path.ensure_ext(self.filepath, - self.filename_ext - if check_extension - else "") + if filepath != self.filepath: + self.filepath = filepath + change_ext = True - if filepath != self.filepath: - self.filepath = filepath - return True + return (change_ext or change_axis) - return False - class ImportHelper: filepath = StringProperty( name="File Path", @@ -99,7 +109,10 @@ context.window_manager.fileselect_add(self) return {'RUNNING_MODAL'} + def check(self, context): + return _check_axis_conversion(self) + # Axis conversion function, not pretty LUT # use lookup tabes to convert between any axis _axis_convert_matrix = ( Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c =================================================================== --- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-08-03 05:01:55 UTC (rev 38963) +++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-08-03 05:32:07 UTC (rev 38964) @@ -1190,7 +1190,7 @@ return TRUE; } -/* dont set windows active in in here, is used by renderwin too */ +/* dont set windows active in here, is used by renderwin too */ void setviewmatrixview3d(Scene *scene, View3D *v3d, RegionView3D *rv3d) { if(rv3d->persp==RV3D_CAMOB) { /* obs/camera */ Modified: trunk/blender/source/blender/render/intern/source/rendercore.c =================================================================== --- trunk/blender/source/blender/render/intern/source/rendercore.c 2011-08-03 05:01:55 UTC (rev 38963) +++ trunk/blender/source/blender/render/intern/source/rendercore.c 2011-08-03 05:32:07 UTC (rev 38964) @@ -730,7 +730,7 @@ if(zpass==NULL) return; - /* check for at least one sun lamp that its atmosphere flag is is enabled */ + /* check for at least one sun lamp that its atmosphere flag is enabled */ for(go=R.lights.first; go; go= go->next) { lar= go->lampren; if(lar->type==LA_SUN && lar->sunsky && (lar->sunsky->effect_type & LA_SUN_EFFECT_AP)) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs