[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40366] branches/soc-2011-radish: Merged 40338-40364
Jason Hays
jason_hays22 at mymail.eku.edu
Mon Sep 19 17:36:31 CEST 2011
Revision: 40366
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40366
Author: jason_hays22
Date: 2011-09-19 15:36:30 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Merged 40338-40364
Modified Paths:
--------------
branches/soc-2011-radish/CMakeLists.txt
branches/soc-2011-radish/SConstruct
branches/soc-2011-radish/build_files/scons/tools/btools.py
branches/soc-2011-radish/extern/glew/include/GL/glew.h
branches/soc-2011-radish/intern/audaspace/intern/AUD_ConverterReader.cpp
branches/soc-2011-radish/intern/audaspace/intern/AUD_Mixer.cpp
branches/soc-2011-radish/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-radish/intern/string/intern/STR_String.cpp
branches/soc-2011-radish/release/scripts/modules/bpy/utils.py
branches/soc-2011-radish/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-radish/release/scripts/modules/bpy_types.py
branches/soc-2011-radish/release/scripts/modules/console_python.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/image.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/object.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-radish/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-radish/release/scripts/templates/operator_export.py
branches/soc-2011-radish/source/blender/avi/intern/avirgb.c
branches/soc-2011-radish/source/blender/avi/intern/endian.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-radish/source/blender/blenkernel/BKE_global.h
branches/soc-2011-radish/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2011-radish/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-radish/source/blender/blenkernel/intern/blender.c
branches/soc-2011-radish/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-radish/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-radish/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-radish/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-radish/source/blender/editors/animation/drivers.c
branches/soc-2011-radish/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-radish/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-radish/source/blender/editors/animation/keyframing.c
branches/soc-2011-radish/source/blender/editors/animation/keyingsets.c
branches/soc-2011-radish/source/blender/editors/armature/editarmature.c
branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-radish/source/blender/editors/armature/poseSlide.c
branches/soc-2011-radish/source/blender/editors/armature/poseobject.c
branches/soc-2011-radish/source/blender/editors/curve/editcurve.c
branches/soc-2011-radish/source/blender/editors/curve/editfont.c
branches/soc-2011-radish/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-radish/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-radish/source/blender/editors/interface/interface_layout.c
branches/soc-2011-radish/source/blender/editors/interface/interface_ops.c
branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c
branches/soc-2011-radish/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-radish/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-radish/source/blender/editors/mesh/meshtools.c
branches/soc-2011-radish/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-radish/source/blender/editors/object/object_constraint.c
branches/soc-2011-radish/source/blender/editors/object/object_edit.c
branches/soc-2011-radish/source/blender/editors/object/object_hook.c
branches/soc-2011-radish/source/blender/editors/object/object_modifier.c
branches/soc-2011-radish/source/blender/editors/object/object_ops.c
branches/soc-2011-radish/source/blender/editors/object/object_relations.c
branches/soc-2011-radish/source/blender/editors/object/object_select.c
branches/soc-2011-radish/source/blender/editors/object/object_shapekey.c
branches/soc-2011-radish/source/blender/editors/object/object_transform.c
branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c
branches/soc-2011-radish/source/blender/editors/physics/particle_edit.c
branches/soc-2011-radish/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-radish/source/blender/editors/render/render_internal.c
branches/soc-2011-radish/source/blender/editors/render/render_opengl.c
branches/soc-2011-radish/source/blender/editors/render/render_shading.c
branches/soc-2011-radish/source/blender/editors/screen/screen_ops.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-radish/source/blender/editors/sound/sound_ops.c
branches/soc-2011-radish/source/blender/editors/space_console/console_ops.c
branches/soc-2011-radish/source/blender/editors/space_file/file_draw.c
branches/soc-2011-radish/source/blender/editors/space_file/file_ops.c
branches/soc-2011-radish/source/blender/editors/space_file/filesel.c
branches/soc-2011-radish/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-radish/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-radish/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-radish/source/blender/editors/space_image/image_ops.c
branches/soc-2011-radish/source/blender/editors/space_info/info_ops.c
branches/soc-2011-radish/source/blender/editors/space_info/info_report.c
branches/soc-2011-radish/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-radish/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-radish/source/blender/editors/space_node/node_edit.c
branches/soc-2011-radish/source/blender/editors/space_node/node_select.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-radish/source/blender/editors/space_text/text_ops.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-radish/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-radish/source/blender/editors/transform/transform_ops.c
branches/soc-2011-radish/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-radish/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-radish/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-radish/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-radish/source/blender/imbuf/SConscript
branches/soc-2011-radish/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-radish/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-radish/source/blender/imbuf/intern/imbuf.h
branches/soc-2011-radish/source/blender/imbuf/intern/jp2.c
branches/soc-2011-radish/source/blender/imbuf/intern/md5.c
branches/soc-2011-radish/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-radish/source/blender/imbuf/intern/tiff.c
branches/soc-2011-radish/source/blender/makesdna/DNA_ID.h
branches/soc-2011-radish/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_actuator_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_controller_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sensor_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-radish/source/blender/python/generic/bgl.c
branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-radish/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-radish/source/blender/render/intern/source/shadbuf.c
Removed Paths:
-------------
branches/soc-2011-radish/source/blender/blenkernel/BKE_endian.h
Property Changed:
----------------
branches/soc-2011-radish/
branches/soc-2011-radish/intern/audaspace/OpenAL/
branches/soc-2011-radish/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:40001-40338
+ /trunk/blender:40001-40364
Modified: branches/soc-2011-radish/CMakeLists.txt
===================================================================
--- branches/soc-2011-radish/CMakeLists.txt 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/CMakeLists.txt 2011-09-19 15:36:30 UTC (rev 40366)
@@ -105,6 +105,7 @@
get_blender_version()
+
# Blender internal features
option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
mark_as_advanced(WITH_BLENDER)
@@ -1150,6 +1151,18 @@
unset(_sse2)
endif()
+
+# set the endian define
+include(TestBigEndian)
+test_big_endian(_SYSTEM_BIG_ENDIAN)
+if(_SYSTEM_BIG_ENDIAN)
+ add_definitions(-D__BIG_ENDIAN__)
+else()
+ add_definitions(-D__LITTLE_ENDIAN__)
+endif()
+unset(_SYSTEM_BIG_ENDIAN)
+
+
if(WITH_IMAGE_OPENJPEG)
if(UNIX AND NOT APPLE)
# dealt with above
Modified: branches/soc-2011-radish/SConstruct
===================================================================
--- branches/soc-2011-radish/SConstruct 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/SConstruct 2011-09-19 15:36:30 UTC (rev 40366)
@@ -337,6 +337,17 @@
env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+
+if btools.ENDIAN == "big":
+ env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
+ env['CXXFLAGS'].append('-D__BIG_ENDIAN__')
+ env['CCFLAGS'].append('-D__BIG_ENDIAN__')
+else:
+ env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
+ env['CXXFLAGS'].append('-D__LITTLE_ENDIAN__')
+ env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')
+
+
# TODO, make optional
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
env['CXXFLAGS'].append('-DWITH_AUDASPACE')
Modified: branches/soc-2011-radish/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-radish/build_files/scons/tools/btools.py 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/build_files/scons/tools/btools.py 2011-09-19 15:36:30 UTC (rev 40366)
@@ -63,10 +63,28 @@
return 'r' + build_rev
+
+# copied from: http://www.scons.org/wiki/AutoconfRecipes
+def checkEndian():
+ import struct
+ array = struct.pack('cccc', '\x01', '\x02', '\x03', '\x04')
+ i = struct.unpack('i', array)
+ # Little Endian
+ if i == struct.unpack('<i', array):
+ return "little"
+ # Big Endian
+ elif i == struct.unpack('>i', array):
+ return "big"
+ else:
+ raise Exception("cant find endian")
+
+
# This is used in creating the local config directories
VERSION, VERSION_DISPLAY = get_version()
REVISION = get_revision()
+ENDIAN = checkEndian()
+
def print_arguments(args, bc):
if len(args):
for k,v in args.iteritems():
Modified: branches/soc-2011-radish/extern/glew/include/GL/glew.h
===================================================================
--- branches/soc-2011-radish/extern/glew/include/GL/glew.h 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/extern/glew/include/GL/glew.h 2011-09-19 15:36:30 UTC (rev 40366)
@@ -16085,7 +16085,7 @@
#else /* GLEW_MX */
-GLEWAPI GLenum glewInit ();
+GLEWAPI GLenum glewInit (void);
GLEWAPI GLboolean glewIsSupported (const char* name);
#define glewIsExtensionSupported(x) glewIsSupported(x)
Property changes on: branches/soc-2011-radish/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36835-38822,39182-40338
/trunk/intern/audaspace/OpenAL:39258-39296
+ /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:36835-38822,39182-40364
/trunk/intern/audaspace/OpenAL:39258-39296
Modified: branches/soc-2011-radish/intern/audaspace/intern/AUD_ConverterReader.cpp
===================================================================
--- branches/soc-2011-radish/intern/audaspace/intern/AUD_ConverterReader.cpp 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/intern/audaspace/intern/AUD_ConverterReader.cpp 2011-09-19 15:36:30 UTC (rev 40366)
@@ -36,9 +36,6 @@
AUD_EffectReader(reader),
m_format(specs.format)
{
- int bigendian = 1;
- bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
-
switch(m_format)
{
case AUD_FORMAT_U8:
@@ -48,10 +45,11 @@
m_convert = AUD_convert_float_s16;
break;
case AUD_FORMAT_S24:
- if(bigendian)
- m_convert = AUD_convert_float_s24_be;
- else
- m_convert = AUD_convert_float_s24_le;
+#ifdef __BIG_ENDIAN__
+ m_convert = AUD_convert_float_s24_be;
+#else
+ m_convert = AUD_convert_float_s24_le;
+#endif
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;
Modified: branches/soc-2011-radish/intern/audaspace/intern/AUD_Mixer.cpp
===================================================================
--- branches/soc-2011-radish/intern/audaspace/intern/AUD_Mixer.cpp 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/intern/audaspace/intern/AUD_Mixer.cpp 2011-09-19 15:36:30 UTC (rev 40366)
@@ -37,9 +37,6 @@
AUD_Mixer::AUD_Mixer(AUD_DeviceSpecs specs) :
m_specs(specs)
{
- int bigendian = 1;
- bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
-
switch(m_specs.format)
{
case AUD_FORMAT_U8:
@@ -49,10 +46,12 @@
m_convert = AUD_convert_float_s16;
break;
case AUD_FORMAT_S24:
- if(bigendian)
- m_convert = AUD_convert_float_s24_be;
- else
- m_convert = AUD_convert_float_s24_le;
+
+#ifdef __BIG_ENDIAN__
+ m_convert = AUD_convert_float_s24_be;
+#else
+ m_convert = AUD_convert_float_s24_le;
+#endif
break;
case AUD_FORMAT_S32:
m_convert = AUD_convert_float_s32;
Modified: branches/soc-2011-radish/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-radish/intern/guardedalloc/intern/mallocn.c 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/intern/guardedalloc/intern/mallocn.c 2011-09-19 15:36:30 UTC (rev 40366)
@@ -124,10 +124,10 @@
/* locally used defines */
/* --------------------------------------------------------------------- */
-#if defined( __sgi) || defined (__sun) || defined (__sun__) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || (defined (__APPLE__) && !defined(__LITTLE_ENDIAN__))
-#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+#ifdef __BIG_ENDIAN__
+# define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
#else
-#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
+# define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
#endif
#define MEMTAG1 MAKE_ID('M', 'E', 'M', 'O')
Modified: branches/soc-2011-radish/intern/string/intern/STR_String.cpp
===================================================================
--- branches/soc-2011-radish/intern/string/intern/STR_String.cpp 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/intern/string/intern/STR_String.cpp 2011-09-19 15:36:30 UTC (rev 40366)
@@ -45,7 +45,7 @@
#include <ctype.h>
#include <string.h>
#if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) || defined (_AIX)
-#include <strings.h>
+# include <strings.h>
#endif
#include "STR_String.h"
Modified: branches/soc-2011-radish/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2011-radish/release/scripts/modules/bpy/utils.py 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/release/scripts/modules/bpy/utils.py 2011-09-19 15:36:30 UTC (rev 40366)
@@ -63,7 +63,7 @@
return None
if "." in module_name:
print("Ignoring '%s', can't import files containing "
- "multiple periods." % module_name)
+ "multiple periods" % module_name)
return None
if use_time:
@@ -159,7 +159,7 @@
traceback.print_exc()
else:
print("\nWarning! '%s' has no register function, "
- "this is now a requirement for registerable scripts." %
+ "this is now a requirement for registerable scripts" %
mod.__file__)
def unregister_module_call(mod):
Modified: branches/soc-2011-radish/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/soc-2011-radish/release/scripts/modules/bpy_extras/io_utils.py 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/release/scripts/modules/bpy_extras/io_utils.py 2011-09-19 15:36:30 UTC (rev 40366)
@@ -233,8 +233,8 @@
return Matrix().to_3x3()
if from_forward[-1] == from_up[-1] or to_forward[-1] == to_up[-1]:
- raise Exception("invalid axis arguments passed, "
- "can't use up/forward on the same axis.")
+ raise Exception("Invalid axis arguments passed, "
+ "can't use up/forward on the same axis")
value = reduce(int.__or__, (_axis_convert_num[a] << (i * 3)
for i, a in enumerate((from_forward,
Modified: branches/soc-2011-radish/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2011-radish/release/scripts/modules/bpy_types.py 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/release/scripts/modules/bpy_types.py 2011-09-19 15:36:30 UTC (rev 40366)
@@ -206,7 +206,7 @@
@property
def children_recursive(self):
- """a list of all children from this bone."""
+ """A list of all children from this bone."""
bones_children = []
for bone in self._other_bones:
index = bone.parent_index(self)
Modified: branches/soc-2011-radish/release/scripts/modules/console_python.py
===================================================================
--- branches/soc-2011-radish/release/scripts/modules/console_python.py 2011-09-19 15:28:43 UTC (rev 40365)
+++ branches/soc-2011-radish/release/scripts/modules/console_python.py 2011-09-19 15:36:30 UTC (rev 40366)
@@ -299,7 +299,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list