[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25565] branches/bmesh/blender: line ending fix
Joseph Eagar
joeedh at gmail.com
Sat Dec 26 10:00:55 CET 2009
Revision: 25565
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25565
Author: joeedh
Date: 2009-12-26 10:00:53 +0100 (Sat, 26 Dec 2009)
Log Message:
-----------
line ending fix
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/io/export_mdd.py
branches/bmesh/blender/release/scripts/modules/dynamic_menu.py
branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/python/BPY_extern.h
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
branches/bmesh/blender/source/blender/python/intern/bpy_ui.c
branches/bmesh/blender/source/blender/python/rna_dump.py
branches/bmesh/blender/source/blender/python/simple_enum_gen.py
Modified: branches/bmesh/blender/release/scripts/io/export_mdd.py
===================================================================
--- branches/bmesh/blender/release/scripts/io/export_mdd.py 2009-12-26 08:47:38 UTC (rev 25564)
+++ branches/bmesh/blender/release/scripts/io/export_mdd.py 2009-12-26 09:00:53 UTC (rev 25565)
@@ -156,10 +156,10 @@
# get first scene to get min and max properties for frames, fps
- minframe = 1
- maxframe = 300000
- minfps = 1
- maxfps = 120
+ minframe = 1
+ maxframe = 300000
+ minfps = 1
+ maxfps = 120
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
@@ -173,10 +173,10 @@
return (ob and ob.type=='MESH')
def execute(self, context):
- if not self.properties.path:
+ if not self.properties.path:
raise Exception("filename not set")
- write(self.properties.path, context.scene, context.active_object,
- self.properties.start_frame, self.properties.end_frame, self.properties.fps )
+ write(self.properties.path, context.scene, context.active_object,
+ self.properties.start_frame, self.properties.end_frame, self.properties.fps )
return ('FINISHED',)
def invoke(self, context, event):
@@ -191,9 +191,9 @@
def menu_func(self, context):
default_path = bpy.data.filename.replace(".blend", ".mdd")
- self.layout.operator(ExportMDD.bl_idname, text="Vertex Keyframe Animation (.mdd)...").path = default_path
+ self.layout.operator(ExportMDD.bl_idname, text="Vertex Keyframe Animation (.mdd)...").path = default_path
menu_item = dynamic_menu.add(bpy.types.INFO_MT_file_export, menu_func)
if __name__=='__main__':
- bpy.ops.export.mdd(path="/tmp/test.mdd")
+ bpy.ops.export.mdd(path="/tmp/test.mdd")
Modified: branches/bmesh/blender/release/scripts/modules/dynamic_menu.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/dynamic_menu.py 2009-12-26 08:47:38 UTC (rev 25564)
+++ branches/bmesh/blender/release/scripts/modules/dynamic_menu.py 2009-12-26 09:00:53 UTC (rev 25565)
@@ -4,12 +4,12 @@
# 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.
Modified: branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c 2009-12-26 08:47:38 UTC (rev 25564)
+++ branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c 2009-12-26 09:00:53 UTC (rev 25565)
@@ -195,12 +195,12 @@
icon= getname_anim_fcurve(name, ale->id, fcu);
uiItemL(col, name, icon);
- /* RNA-Path Editing - only really should be enabled when things aren't working */
- col= uiLayoutColumn(layout, 1);
- uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED));
- uiItemR(col, "", ICON_RNA, &fcu_ptr, "rna_path", 0);
- uiItemR(col, NULL, 0, &fcu_ptr, "array_index", 0);
-
+ /* RNA-Path Editing - only really should be enabled when things aren't working */
+ col= uiLayoutColumn(layout, 1);
+ uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED));
+ uiItemR(col, "", ICON_RNA, &fcu_ptr, "rna_path", 0);
+ uiItemR(col, NULL, 0, &fcu_ptr, "array_index", 0);
+
/* color settings */
col= uiLayoutColumn(layout, 1);
uiItemL(col, "Display Color:", 0);
@@ -285,7 +285,7 @@
ChannelDriver *driver= fcu->driver;
/* clear invalid flags */
- fcu->flag &= ~FCURVE_DISABLED; // XXX?
+ fcu->flag &= ~FCURVE_DISABLED; // XXX?
driver->flag &= ~DRIVER_FLAG_INVALID;
}
@@ -330,7 +330,7 @@
uiButSetFunc(but, driver_update_flags_cb, fcu, NULL);
but= uiDefBut(block, BUT, B_IPO_DEPCHANGE, "Remove Driver", 0, 0, 10*UI_UNIT_X, 18, NULL, 0.0, 0.0, 0, 0, "Remove this driver");
- uiButSetNFunc(but, driver_remove_cb, MEM_dupallocN(ale), NULL);
+ uiButSetNFunc(but, driver_remove_cb, MEM_dupallocN(ale), NULL);
/* driver-level settings - type, expressions, and errors */
RNA_pointer_create(ale->id, &RNA_Driver, driver, &driver_ptr);
@@ -450,7 +450,7 @@
for (fcm= fcu->modifiers.first; fcm; fcm= fcm->next) {
col= uiLayoutColumn(pa->layout, 1);
- ANIM_uiTemplate_fmodifier_draw(C, col, ale->id, &fcu->modifiers, fcm);
+ ANIM_uiTemplate_fmodifier_draw(C, col, ale->id, &fcu->modifiers, fcm);
}
MEM_freeN(ale);
Modified: branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c 2009-12-26 08:47:38 UTC (rev 25564)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c 2009-12-26 09:00:53 UTC (rev 25565)
@@ -370,7 +370,7 @@
{
bArmature *arm= ob->data;
- if(arm->act_bone && (arm->act_bone->flag & BONE_SELECTED)==0) {
+ if(arm->act_bone && (arm->act_bone->flag & BONE_SELECTED)==0) {
arm->act_bone= NULL;
}
}
@@ -1735,7 +1735,7 @@
vc->em= ((Mesh *)vc->obedit->data)->edit_btmesh;
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
- data.vc = vc;
+ data.vc = vc;
data.select = selecting;
data.mval[0] = mval[0];
data.mval[1] = mval[1];
Modified: branches/bmesh/blender/source/blender/python/BPY_extern.h
===================================================================
--- branches/bmesh/blender/source/blender/python/BPY_extern.h 2009-12-26 08:47:38 UTC (rev 25564)
+++ branches/bmesh/blender/source/blender/python/BPY_extern.h 2009-12-26 09:00:53 UTC (rev 25565)
@@ -72,73 +72,73 @@
This is necassary to avoid blender buttons storing invalid pointers to freed
python data.*/
-// void BPy_Set_DrawButtonsList(void *list);
-// void BPy_Free_DrawButtonsList(void);
-//
+// void BPy_Set_DrawButtonsList(void *list);
+// void BPy_Free_DrawButtonsList(void);
+//
void BPY_pyconstraint_eval(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets);
-// void BPY_pyconstraint_settings(void *arg1, void *arg2);
+// void BPY_pyconstraint_settings(void *arg1, void *arg2);
void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct);
void BPY_pyconstraint_update(struct Object *owner, struct bConstraint *con);
int BPY_is_pyconstraint(struct Text *text);
-// void BPY_free_pyconstraint_links(struct Text *text);
-//
+// void BPY_free_pyconstraint_links(struct Text *text);
+//
void BPY_start_python( int argc, char **argv );
void BPY_end_python( void );
-// void init_syspath( int first_time );
-// void syspath_append( char *dir );
-// void BPY_rebuild_syspath( void );
-// int BPY_path_update( void );
-//
-// int BPY_Err_getLinenumber( void );
-// const char *BPY_Err_getFilename( void );
-//
-// int BPY_txt_do_python_Text( struct Text *text );
-// int BPY_menu_do_python( short menutype, int event );
-// int BPY_menu_do_shortcut( short menutype, unsigned short key, unsigned short modifiers );
-// int BPY_menu_invoke( struct BPyMenu *pym, short menutype );
+// void init_syspath( int first_time );
+// void syspath_append( char *dir );
+// void BPY_rebuild_syspath( void );
+// int BPY_path_update( void );
+//
+// int BPY_Err_getLinenumber( void );
+// const char *BPY_Err_getFilename( void );
+//
+// int BPY_txt_do_python_Text( struct Text *text );
+// int BPY_menu_do_python( short menutype, int event );
+// int BPY_menu_do_shortcut( short menutype, unsigned short key, unsigned short modifiers );
+// int BPY_menu_invoke( struct BPyMenu *pym, short menutype );
/* 2.5 UI Scripts */
int BPY_run_python_script( struct bContext *C, const char *filename, struct Text *text, struct ReportList *reports ); // 2.5 working
int BPY_run_script_space_draw(const struct bContext *C, struct SpaceScript * sc); // 2.5 working
// int BPY_run_script_space_listener(struct bContext *C, struct SpaceScript * sc, struct ARegion *ar, struct wmNotifier *wmn); // 2.5 working
void BPY_update_modules( void ); // XXX - annoying, need this for pointers that get out of date
-//
+//
int BPY_context_get(struct bContext *C, const char *member, struct bContextDataResult *result);
-//
-// int BPY_run_script(struct Script *script);
+//
+// int BPY_run_script(struct Script *script);
void BPY_free_compiled_text( struct Text *text );
-//
-// int BPY_has_onload_script( void );
-//
-// int BPY_is_spacehandler(struct Text *text, char spacetype);
-// int BPY_del_spacehandler(struct Text *text, struct ScrArea *sa);
-// int BPY_add_spacehandler(struct Text *txt, struct ScrArea *sa,char spacetype);
-// int BPY_has_spacehandler(struct Text *text, struct ScrArea *sa);
-// void BPY_screen_free_spacehandlers(struct bScreen *sc);
-// int BPY_do_spacehandlers(struct ScrArea *sa, unsigned short event,
-// short eventValue, unsigned short space_event);
-//
-// void BPY_pydriver_update(void);
+//
+// int BPY_has_onload_script( void );
+//
+// int BPY_is_spacehandler(struct Text *text, char spacetype);
+// int BPY_del_spacehandler(struct Text *text, struct ScrArea *sa);
+// int BPY_add_spacehandler(struct Text *txt, struct ScrArea *sa,char spacetype);
+// int BPY_has_spacehandler(struct Text *text, struct ScrArea *sa);
+// void BPY_screen_free_spacehandlers(struct bScreen *sc);
+// int BPY_do_spacehandlers(struct ScrArea *sa, unsigned short event,
+// short eventValue, unsigned short space_event);
+//
+// void BPY_pydriver_update(void);
float BPY_pydriver_eval(struct ChannelDriver *driver);
-//
+//
int BPY_button_eval(struct bContext *C, char *expr, double *value);
/* format importer hook */
int BPY_call_importloader( char *name );
-//
-// void BPY_spacescript_do_pywin_draw( struct SpaceScript *sc );
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list