[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28821] branches/soc-2010-kwk: merge 28746 :28819

Konrad Kleine konrad at konradwilhelm.de
Tue May 18 12:01:35 CEST 2010 

Revision: 28821
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28821
Author:   kwk
Date:     2010-05-18 12:01:34 +0200 (Tue, 18 May 2010)

Log Message:
-----------
merge 28746:28819

Modified Paths:
--------------
    branches/soc-2010-kwk/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/soc-2010-kwk/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2010-kwk/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/soc-2010-kwk/intern/ghost/CMakeLists.txt
    branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py
    branches/soc-2010-kwk/release/scripts/io/import_shape_mdd.py
    branches/soc-2010-kwk/release/scripts/modules/bpy/utils.py
    branches/soc-2010-kwk/release/scripts/modules/bpy_types.py
    branches/soc-2010-kwk/release/scripts/modules/rna_info.py
    branches/soc-2010-kwk/release/scripts/op/nla.py
    branches/soc-2010-kwk/release/scripts/op/sequencer.py
    branches/soc-2010-kwk/release/scripts/op/wm.py
    branches/soc-2010-kwk/release/scripts/ui/properties_animviz.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_armature.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_armature_rigify.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_bone.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_camera.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_empty.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_lamp.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_lattice.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_mesh.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_metaball.py
    branches/soc-2010-kwk/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-kwk/release/scripts/ui/properties_game.py
    branches/soc-2010-kwk/release/scripts/ui/properties_material.py
    branches/soc-2010-kwk/release/scripts/ui/properties_object.py
    branches/soc-2010-kwk/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-kwk/release/scripts/ui/properties_particle.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_field.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2010-kwk/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-kwk/release/scripts/ui/properties_render.py
    branches/soc-2010-kwk/release/scripts/ui/properties_scene.py
    branches/soc-2010-kwk/release/scripts/ui/properties_texture.py
    branches/soc-2010-kwk/release/scripts/ui/properties_world.py
    branches/soc-2010-kwk/release/scripts/ui/space_image.py
    branches/soc-2010-kwk/release/scripts/ui/space_logic.py
    branches/soc-2010-kwk/release/scripts/ui/space_sequencer.py
    branches/soc-2010-kwk/release/scripts/ui/space_text.py
    branches/soc-2010-kwk/release/scripts/ui/space_userpref.py
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_smoke.h
    branches/soc-2010-kwk/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2010-kwk/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/displist.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-kwk/source/blender/blenkernel/intern/smoke.c
    branches/soc-2010-kwk/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2010-kwk/source/blender/collada/Makefile
    branches/soc-2010-kwk/source/blender/editors/animation/keyingsets.c
    branches/soc-2010-kwk/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-kwk/source/blender/editors/interface/interface_layout.c
    branches/soc-2010-kwk/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-kwk/source/blender/editors/interface/resources.c
    branches/soc-2010-kwk/source/blender/editors/object/object_constraint.c
    branches/soc-2010-kwk/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2010-kwk/source/blender/editors/render/render_shading.c
    branches/soc-2010-kwk/source/blender/editors/space_file/filelist.c
    branches/soc-2010-kwk/source/blender/editors/space_file/filelist.h
    branches/soc-2010-kwk/source/blender/editors/space_file/space_file.c
    branches/soc-2010-kwk/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2010-kwk/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-kwk/source/blender/editors/space_logic/space_logic.c
    branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2010-kwk/source/blender/editors/transform/transform.c
    branches/soc-2010-kwk/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-kwk/source/blender/editors/transform/transform_generics.c
    branches/soc-2010-kwk/source/blender/editors/transform/transform_orientations.c
    branches/soc-2010-kwk/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/jp2.c
    branches/soc-2010-kwk/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-kwk/source/blender/imbuf/intern/tiff.c
    branches/soc-2010-kwk/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-kwk/source/blender/makesrna/RNA_types.h
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_action.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-kwk/source/blender/makesrna/intern/rna_world.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2010-kwk/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2010-kwk/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-kwk/source/blender/python/generic/bgl.c
    branches/soc-2010-kwk/source/blender/python/generic/blf_api.c
    branches/soc-2010-kwk/source/blender/python/generic/mathutils_color.c
    branches/soc-2010-kwk/source/blender/python/generic/mathutils_euler.c
    branches/soc-2010-kwk/source/blender/python/generic/mathutils_matrix.c
    branches/soc-2010-kwk/source/blender/python/generic/mathutils_quat.c
    branches/soc-2010-kwk/source/blender/python/generic/mathutils_vector.c
    branches/soc-2010-kwk/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-kwk/source/creator/creator.c
    branches/soc-2010-kwk/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2010-kwk/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-kwk/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2010-kwk/source/gameengine/Ketsji/KX_Scene.cpp

Added Paths:
-----------
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/page.html
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/bg.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/favicon.ico
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/jquery.sidebar.js
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/pygments.css
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rnd.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rndbl.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rndbr.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/theme.conf
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-kwk/source/gameengine/PyDoc/bge.types.rst

Removed Paths:
-------------
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/page.html
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/bg.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/favicon.ico
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/jquery.sidebar.js
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/pygments.css
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rnd.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rndbl.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/static/rndbr.png
    branches/soc-2010-kwk/source/blender/python/doc/blender-org/theme.conf
    branches/soc-2010-kwk/source/gameengine/PyDoc/GameKeys.py
    branches/soc-2010-kwk/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2010-kwk/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2010-kwk/source/gameengine/PyDoc/Rasterizer.py

Modified: branches/soc-2010-kwk/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
===================================================================
--- branches/soc-2010-kwk/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp	2010-05-18 10:01:34 UTC (rev 28821)
@@ -23,6 +23,9 @@
  * ***** END LGPL LICENSE BLOCK *****
  */
 
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+
 #include "AUD_FFMPEGFactory.h"
 #include "AUD_FFMPEGReader.h"
 #include "AUD_Buffer.h"

Modified: branches/soc-2010-kwk/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2010-kwk/intern/audaspace/intern/AUD_C-API.cpp	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/intern/audaspace/intern/AUD_C-API.cpp	2010-05-18 10:01:34 UTC (rev 28821)
@@ -27,6 +27,11 @@
 #include <cstring>
 #include <cmath>
 
+#ifdef WITH_FFMPEG
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+#endif
+
 #include "AUD_NULLDevice.h"
 #include "AUD_I3DDevice.h"
 #include "AUD_FileFactory.h"
@@ -62,6 +67,7 @@
 #include "AUD_JackDevice.h"
 #endif
 
+
 #ifdef WITH_FFMPEG
 extern "C" {
 #include <libavformat/avformat.h>

Modified: branches/soc-2010-kwk/intern/audaspace/intern/AUD_FileFactory.cpp
===================================================================
--- branches/soc-2010-kwk/intern/audaspace/intern/AUD_FileFactory.cpp	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/intern/audaspace/intern/AUD_FileFactory.cpp	2010-05-18 10:01:34 UTC (rev 28821)
@@ -29,6 +29,9 @@
 #include <cstring>
 
 #ifdef WITH_FFMPEG
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+
 #include "AUD_FFMPEGReader.h"
 #endif
 #ifdef WITH_SNDFILE

Modified: branches/soc-2010-kwk/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2010-kwk/intern/ghost/CMakeLists.txt	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/intern/ghost/CMakeLists.txt	2010-05-18 10:01:34 UTC (rev 28821)
@@ -24,57 +24,67 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . ../string ../../extern/glew/include ../../source/blender/imbuf ../../source/blender/makesdna)
+SET(INC
+	.
+	../string
+	../../extern/glew/include
+	../../source/blender/imbuf
+	../../source/blender/makesdna
+)
 
-FILE(GLOB SRC intern/*.cpp intern/*.mm)
+SET(SRC
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Buttons.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_CallbackEventConsumer.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_C-api.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManager.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_EventManager.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_EventPrinter.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_ISystem.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_ModifierKeys.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_NDOFManager.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Rect.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_System.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_TimerManager.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Window.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowManager.cpp
+)
 
 IF(APPLE)
 	IF(WITH_COCOA)
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
+		SET(SRC ${SRC}
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
+		)
 	ELSE(WITH_COCOA)
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm")
+		SET(SRC ${SRC}
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
+		)
 	ENDIF(WITH_COCOA)
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
 
 	IF(WITH_QUICKTIME)
 		ADD_DEFINITIONS(-DWITH_QUICKTIME)
 	ENDIF(WITH_QUICKTIME)
-ELSE(APPLE)
-	IF(WIN32)
-		SET(INC ${INC} ${WINTAB_INC})
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp")
-	ELSE(WIN32)
-		SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm")
-		LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm")
-	ENDIF(WIN32)
+ELSEIF(WIN32)
+	SET(INC ${INC} ${WINTAB_INC})
+
+	SET(SRC ${SRC}
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
+	)
+ELSEIF(UNIX)
+	SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+
+	SET(SRC ${SRC}
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
+		${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
+	)
 ENDIF(APPLE)
 
 BLENDERLIB(bf_ghost "${SRC}" "${INC}")
-#, libtype=['core','player'], priority = [25,15] ) 
+

Modified: branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/release/scripts/io/engine_render_pov.py	2010-05-18 10:01:34 UTC (rev 28821)
@@ -545,7 +545,7 @@
 
         mist = world.mist
 
-        if mist.enabled:
+        if mist.use_mist:
             file.write('fog {\n')
             file.write('\tdistance %.6f\n' % mist.depth)
             file.write('\tcolor rgbt<%.3g, %.3g, %.3g, %.3g>\n' % (tuple(world.horizon_color) + (1 - mist.intensity,)))
@@ -629,7 +629,7 @@
     file.write('Output_File_Type=T\n') # TGA, best progressive loading
     file.write('Output_Alpha=1\n')
 
-    if render.antialiasing:
+    if render.render_antialiasing:
         aa_mapping = {'5': 2, '8': 3, '11': 4, '16': 5} # method 1 assumed
         file.write('Antialias=1\n')
         file.write('Antialias_Depth=%d\n' % aa_mapping[render.antialiasing_samples])

Modified: branches/soc-2010-kwk/release/scripts/io/import_shape_mdd.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/io/import_shape_mdd.py	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/release/scripts/io/import_shape_mdd.py	2010-05-18 10:01:34 UTC (rev 28821)
@@ -104,7 +104,7 @@
 
 class importMDD(bpy.types.Operator):
     '''Import MDD vertex keyframe file to shape keys'''
-    bl_idname = "import.mdd"
+    bl_idname = "import_shape.mdd"
     bl_label = "Import MDD"
 
     # get first scene to get min and max properties for frames, fps

Modified: branches/soc-2010-kwk/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/modules/bpy/utils.py	2010-05-18 09:53:16 UTC (rev 28820)
+++ branches/soc-2010-kwk/release/scripts/modules/bpy/utils.py	2010-05-18 10:01:34 UTC (rev 28821)
@@ -348,7 +348,7 @@
     hours = minutes = seconds = frames = 0
 
     if time < 0:
-        time = -time
+        time = - time
         neg = "-"
     else:
         neg = ""
@@ -361,11 +361,11 @@
         time = time % 60.0
 
     seconds = int(time)
-    frames= int(round(math.floor( ((time - seconds) * fps))))
+    frames= int(round(math.floor(((time - seconds) * fps))))
 
     return "%s%02d:%02d:%02d:%02d" % (neg, hours, minutes, seconds, frames)
-    
 
+
 def smpte_from_frame(frame, fps=None, fps_base=None):
     '''
     Returns an SMPTE formatted string from the frame: "HH:MM:SS:FF".
@@ -380,4 +380,3 @@
         fps_base = _bpy.context.scene.render.fps_base
 
     return smpte_from_seconds((frame * fps_base) / fps, fps)
-    
\ No newline at end of file

Modified: branches/soc-2010-kwk/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/modules/bpy_types.py	2010-05-18 09:53:16 UTC (rev 28820)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list