[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28930] branches/hairsim: merge with renderbranch at r28917
Joseph Eagar
joeedh at gmail.com
Sun May 23 11:27:59 CEST 2010
Revision: 28930
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28930
Author: joeedh
Date: 2010-05-23 11:27:58 +0200 (Sun, 23 May 2010)
Log Message:
-----------
merge with renderbranch at r28917
Modified Paths:
--------------
branches/hairsim/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
branches/hairsim/intern/audaspace/intern/AUD_C-API.cpp
branches/hairsim/intern/audaspace/intern/AUD_FileFactory.cpp
branches/hairsim/intern/ghost/CMakeLists.txt
branches/hairsim/release/scripts/io/engine_render_pov.py
branches/hairsim/release/scripts/io/import_shape_mdd.py
branches/hairsim/release/scripts/io/netrender/__init__.py
branches/hairsim/release/scripts/io/netrender/model.py
branches/hairsim/release/scripts/io/netrender/operators.py
branches/hairsim/release/scripts/io/netrender/slave.py
branches/hairsim/release/scripts/io/netrender/ui.py
branches/hairsim/release/scripts/io/netrender/utils.py
branches/hairsim/release/scripts/modules/bpy/utils.py
branches/hairsim/release/scripts/modules/bpy_types.py
branches/hairsim/release/scripts/modules/graphviz_export.py
branches/hairsim/release/scripts/modules/rigify/eye_lid.py
branches/hairsim/release/scripts/modules/rna_info.py
branches/hairsim/release/scripts/modules/rna_prop_ui.py
branches/hairsim/release/scripts/op/console_python.py
branches/hairsim/release/scripts/op/image.py
branches/hairsim/release/scripts/op/nla.py
branches/hairsim/release/scripts/op/object.py
branches/hairsim/release/scripts/op/presets.py
branches/hairsim/release/scripts/op/sequencer.py
branches/hairsim/release/scripts/op/uvcalc_smart_project.py
branches/hairsim/release/scripts/op/vertexpaint_dirt.py
branches/hairsim/release/scripts/op/wm.py
branches/hairsim/release/scripts/ui/properties_animviz.py
branches/hairsim/release/scripts/ui/properties_data_armature.py
branches/hairsim/release/scripts/ui/properties_data_armature_rigify.py
branches/hairsim/release/scripts/ui/properties_data_bone.py
branches/hairsim/release/scripts/ui/properties_data_camera.py
branches/hairsim/release/scripts/ui/properties_data_curve.py
branches/hairsim/release/scripts/ui/properties_data_empty.py
branches/hairsim/release/scripts/ui/properties_data_lamp.py
branches/hairsim/release/scripts/ui/properties_data_lattice.py
branches/hairsim/release/scripts/ui/properties_data_mesh.py
branches/hairsim/release/scripts/ui/properties_data_metaball.py
branches/hairsim/release/scripts/ui/properties_data_modifier.py
branches/hairsim/release/scripts/ui/properties_game.py
branches/hairsim/release/scripts/ui/properties_material.py
branches/hairsim/release/scripts/ui/properties_object.py
branches/hairsim/release/scripts/ui/properties_object_constraint.py
branches/hairsim/release/scripts/ui/properties_particle.py
branches/hairsim/release/scripts/ui/properties_physics_cloth.py
branches/hairsim/release/scripts/ui/properties_physics_common.py
branches/hairsim/release/scripts/ui/properties_physics_field.py
branches/hairsim/release/scripts/ui/properties_physics_fluid.py
branches/hairsim/release/scripts/ui/properties_physics_smoke.py
branches/hairsim/release/scripts/ui/properties_physics_softbody.py
branches/hairsim/release/scripts/ui/properties_render.py
branches/hairsim/release/scripts/ui/properties_scene.py
branches/hairsim/release/scripts/ui/properties_texture.py
branches/hairsim/release/scripts/ui/properties_world.py
branches/hairsim/release/scripts/ui/space_image.py
branches/hairsim/release/scripts/ui/space_info.py
branches/hairsim/release/scripts/ui/space_logic.py
branches/hairsim/release/scripts/ui/space_node.py
branches/hairsim/release/scripts/ui/space_outliner.py
branches/hairsim/release/scripts/ui/space_sequencer.py
branches/hairsim/release/scripts/ui/space_text.py
branches/hairsim/release/scripts/ui/space_time.py
branches/hairsim/release/scripts/ui/space_userpref.py
branches/hairsim/release/scripts/ui/space_userpref_keymap.py
branches/hairsim/release/scripts/ui/space_view3d.py
branches/hairsim/source/blender/blenkernel/BKE_node.h
branches/hairsim/source/blender/blenkernel/BKE_particle.h
branches/hairsim/source/blender/blenkernel/BKE_pointcache.h
branches/hairsim/source/blender/blenkernel/BKE_utildefines.h
branches/hairsim/source/blender/blenkernel/intern/anim.c
branches/hairsim/source/blender/blenkernel/intern/anim_sys.c
branches/hairsim/source/blender/blenkernel/intern/armature.c
branches/hairsim/source/blender/blenkernel/intern/cloth.c
branches/hairsim/source/blender/blenkernel/intern/collision.c
branches/hairsim/source/blender/blenkernel/intern/depsgraph.c
branches/hairsim/source/blender/blenkernel/intern/effect.c
branches/hairsim/source/blender/blenkernel/intern/node.c
branches/hairsim/source/blender/blenkernel/intern/object.c
branches/hairsim/source/blender/blenkernel/intern/packedFile.c
branches/hairsim/source/blender/blenkernel/intern/particle.c
branches/hairsim/source/blender/blenkernel/intern/particle_system.c
branches/hairsim/source/blender/blenkernel/intern/pointcache.c
branches/hairsim/source/blender/blenkernel/intern/smoke.c
branches/hairsim/source/blender/blenkernel/intern/softbody.c
branches/hairsim/source/blender/blenlib/BLI_linklist.h
branches/hairsim/source/blender/blenlib/intern/BLI_linklist.c
branches/hairsim/source/blender/blenlib/intern/threads.c
branches/hairsim/source/blender/blenloader/intern/readblenentry.c
branches/hairsim/source/blender/blenloader/intern/readfile.c
branches/hairsim/source/blender/editors/animation/anim_channels_edit.c
branches/hairsim/source/blender/editors/animation/anim_filter.c
branches/hairsim/source/blender/editors/animation/keyingsets.c
branches/hairsim/source/blender/editors/include/ED_anim_api.h
branches/hairsim/source/blender/editors/interface/interface_handlers.c
branches/hairsim/source/blender/editors/interface/interface_layout.c
branches/hairsim/source/blender/editors/interface/interface_templates.c
branches/hairsim/source/blender/editors/interface/resources.c
branches/hairsim/source/blender/editors/interface/view2d.c
branches/hairsim/source/blender/editors/interface/view2d_ops.c
branches/hairsim/source/blender/editors/object/object_constraint.c
branches/hairsim/source/blender/editors/object/object_edit.c
branches/hairsim/source/blender/editors/object/object_intern.h
branches/hairsim/source/blender/editors/object/object_ops.c
branches/hairsim/source/blender/editors/object/object_relations.c
branches/hairsim/source/blender/editors/physics/particle_edit.c
branches/hairsim/source/blender/editors/physics/physics_pointcache.c
branches/hairsim/source/blender/editors/render/render_opengl.c
branches/hairsim/source/blender/editors/render/render_preview.c
branches/hairsim/source/blender/editors/screen/screen_ops.c
branches/hairsim/source/blender/editors/space_action/action_edit.c
branches/hairsim/source/blender/editors/space_action/action_select.c
branches/hairsim/source/blender/editors/space_file/filelist.c
branches/hairsim/source/blender/editors/space_file/filelist.h
branches/hairsim/source/blender/editors/space_file/space_file.c
branches/hairsim/source/blender/editors/space_graph/graph_buttons.c
branches/hairsim/source/blender/editors/space_graph/graph_edit.c
branches/hairsim/source/blender/editors/space_graph/graph_intern.h
branches/hairsim/source/blender/editors/space_graph/graph_select.c
branches/hairsim/source/blender/editors/space_graph/space_graph.c
branches/hairsim/source/blender/editors/space_image/image_ops.c
branches/hairsim/source/blender/editors/space_logic/logic_intern.h
branches/hairsim/source/blender/editors/space_logic/logic_window.c
branches/hairsim/source/blender/editors/space_logic/space_logic.c
branches/hairsim/source/blender/editors/space_nla/nla_edit.c
branches/hairsim/source/blender/editors/space_nla/nla_intern.h
branches/hairsim/source/blender/editors/space_nla/nla_ops.c
branches/hairsim/source/blender/editors/space_nla/nla_select.c
branches/hairsim/source/blender/editors/space_node/node_draw.c
branches/hairsim/source/blender/editors/space_node/space_node.c
branches/hairsim/source/blender/editors/space_outliner/outliner.c
branches/hairsim/source/blender/editors/space_outliner/space_outliner.c
branches/hairsim/source/blender/editors/space_sequencer/sequencer_edit.c
branches/hairsim/source/blender/editors/space_view3d/drawanimviz.c
branches/hairsim/source/blender/editors/space_view3d/drawobject.c
branches/hairsim/source/blender/editors/space_view3d/view3d_draw.c
branches/hairsim/source/blender/editors/space_view3d/view3d_view.c
branches/hairsim/source/blender/editors/transform/transform.c
branches/hairsim/source/blender/editors/transform/transform.h
branches/hairsim/source/blender/editors/transform/transform_conversions.c
branches/hairsim/source/blender/editors/transform/transform_generics.c
branches/hairsim/source/blender/editors/transform/transform_orientations.c
branches/hairsim/source/blender/gpu/GPU_draw.h
branches/hairsim/source/blender/gpu/intern/gpu_draw.c
branches/hairsim/source/blender/imbuf/intern/anim.c
branches/hairsim/source/blender/imbuf/intern/jp2.c
branches/hairsim/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/hairsim/source/blender/imbuf/intern/tiff.c
branches/hairsim/source/blender/makesdna/DNA_action_types.h
branches/hairsim/source/blender/makesdna/DNA_actuator_types.h
branches/hairsim/source/blender/makesdna/DNA_cloth_types.h
branches/hairsim/source/blender/makesdna/DNA_controller_types.h
branches/hairsim/source/blender/makesdna/DNA_group_types.h
branches/hairsim/source/blender/makesdna/DNA_material_types.h
branches/hairsim/source/blender/makesdna/DNA_object_types.h
branches/hairsim/source/blender/makesdna/DNA_particle_types.h
branches/hairsim/source/blender/makesdna/DNA_scene_types.h
branches/hairsim/source/blender/makesdna/DNA_sensor_types.h
branches/hairsim/source/blender/makesdna/DNA_userdef_types.h
branches/hairsim/source/blender/makesdna/DNA_view2d_types.h
branches/hairsim/source/blender/makesrna/RNA_types.h
branches/hairsim/source/blender/makesrna/intern/rna_action.c
branches/hairsim/source/blender/makesrna/intern/rna_actuator.c
branches/hairsim/source/blender/makesrna/intern/rna_animation.c
branches/hairsim/source/blender/makesrna/intern/rna_animviz.c
branches/hairsim/source/blender/makesrna/intern/rna_curve.c
branches/hairsim/source/blender/makesrna/intern/rna_define.c
branches/hairsim/source/blender/makesrna/intern/rna_fcurve.c
branches/hairsim/source/blender/makesrna/intern/rna_image.c
branches/hairsim/source/blender/makesrna/intern/rna_main_api.c
branches/hairsim/source/blender/makesrna/intern/rna_material.c
branches/hairsim/source/blender/makesrna/intern/rna_modifier.c
branches/hairsim/source/blender/makesrna/intern/rna_object.c
branches/hairsim/source/blender/makesrna/intern/rna_object_force.c
branches/hairsim/source/blender/makesrna/intern/rna_render.c
branches/hairsim/source/blender/makesrna/intern/rna_rna.c
branches/hairsim/source/blender/makesrna/intern/rna_scene.c
branches/hairsim/source/blender/makesrna/intern/rna_sensor.c
branches/hairsim/source/blender/makesrna/intern/rna_space.c
branches/hairsim/source/blender/makesrna/intern/rna_texture.c
branches/hairsim/source/blender/makesrna/intern/rna_userdef.c
branches/hairsim/source/blender/makesrna/intern/rna_world.c
branches/hairsim/source/blender/modifiers/intern/MOD_collision.c
branches/hairsim/source/blender/modifiers/intern/MOD_explode.c
branches/hairsim/source/blender/modifiers/intern/MOD_particleinstance.c
branches/hairsim/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/hairsim/source/blender/python/doc/sphinx_doc_gen.py
branches/hairsim/source/blender/python/doc/sphinx_doc_gen.sh
branches/hairsim/source/blender/python/generic/bgl.c
branches/hairsim/source/blender/python/generic/blf_api.c
branches/hairsim/source/blender/python/generic/geometry.c
branches/hairsim/source/blender/python/generic/mathutils_color.c
branches/hairsim/source/blender/python/generic/mathutils_euler.c
branches/hairsim/source/blender/python/generic/mathutils_matrix.c
branches/hairsim/source/blender/python/generic/mathutils_quat.c
branches/hairsim/source/blender/python/generic/mathutils_vector.c
branches/hairsim/source/blender/python/intern/bpy.c
branches/hairsim/source/blender/python/intern/bpy_app.c
branches/hairsim/source/blender/python/intern/bpy_driver.c
branches/hairsim/source/blender/python/intern/bpy_props.c
branches/hairsim/source/blender/python/intern/bpy_props.h
branches/hairsim/source/blender/python/intern/bpy_rna.c
branches/hairsim/source/blender/render/extern/include/RE_shader_ext.h
branches/hairsim/source/blender/render/intern/source/convertblender.c
branches/hairsim/source/blender/render/intern/source/object_particle.c
branches/hairsim/source/blender/render/intern/source/result.c
branches/hairsim/source/blender/render/intern/source/shadeinput.c
branches/hairsim/source/blender/render/intern/source/texture_pointdensity.c
branches/hairsim/source/blender/windowmanager/intern/wm_files.c
branches/hairsim/source/blender/windowmanager/intern/wm_init_exit.c
branches/hairsim/source/blender/windowmanager/intern/wm_jobs.c
branches/hairsim/source/blender/windowmanager/intern/wm_operators.c
branches/hairsim/source/blender/windowmanager/intern/wm_window.c
branches/hairsim/source/blender/windowmanager/wm_event_types.h
branches/hairsim/source/creator/creator.c
branches/hairsim/source/gameengine/Expressions/ListValue.cpp
branches/hairsim/source/gameengine/Ketsji/KX_GameObject.cpp
branches/hairsim/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/hairsim/source/gameengine/Ketsji/KX_Scene.cpp
Added Paths:
-----------
branches/hairsim/release/scripts/templates/operator_modal_view3d.py
branches/hairsim/source/blender/python/doc/blender-org/
branches/hairsim/source/blender/python/doc/blender-org/layout.html
branches/hairsim/source/blender/python/doc/blender-org/page.html
branches/hairsim/source/blender/python/doc/blender-org/static/
branches/hairsim/source/blender/python/doc/blender-org/static/bg.png
branches/hairsim/source/blender/python/doc/blender-org/static/default.css_t
branches/hairsim/source/blender/python/doc/blender-org/static/favicon.ico
branches/hairsim/source/blender/python/doc/blender-org/static/jquery.sidebar.js
branches/hairsim/source/blender/python/doc/blender-org/static/pygments.css
branches/hairsim/source/blender/python/doc/blender-org/static/rnd.png
branches/hairsim/source/blender/python/doc/blender-org/static/rndbl.png
branches/hairsim/source/blender/python/doc/blender-org/static/rndbr.png
branches/hairsim/source/blender/python/doc/blender-org/theme.conf
branches/hairsim/source/gameengine/PyDoc/bge.render.rst
branches/hairsim/source/gameengine/PyDoc/bge.types.rst
Removed Paths:
-------------
branches/hairsim/source/blender/python/doc/blender-org/layout.html
branches/hairsim/source/blender/python/doc/blender-org/page.html
branches/hairsim/source/blender/python/doc/blender-org/static/
branches/hairsim/source/blender/python/doc/blender-org/static/bg.png
branches/hairsim/source/blender/python/doc/blender-org/static/default.css_t
branches/hairsim/source/blender/python/doc/blender-org/static/favicon.ico
branches/hairsim/source/blender/python/doc/blender-org/static/jquery.sidebar.js
branches/hairsim/source/blender/python/doc/blender-org/static/pygments.css
branches/hairsim/source/blender/python/doc/blender-org/static/rnd.png
branches/hairsim/source/blender/python/doc/blender-org/static/rndbl.png
branches/hairsim/source/blender/python/doc/blender-org/static/rndbr.png
branches/hairsim/source/blender/python/doc/blender-org/theme.conf
branches/hairsim/source/gameengine/PyDoc/GameKeys.py
branches/hairsim/source/gameengine/PyDoc/GameLogic.py
branches/hairsim/source/gameengine/PyDoc/GameTypes.py
branches/hairsim/source/gameengine/PyDoc/Rasterizer.py
Modified: branches/hairsim/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
===================================================================
--- branches/hairsim/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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/hairsim/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/hairsim/intern/audaspace/intern/AUD_C-API.cpp 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/intern/audaspace/intern/AUD_C-API.cpp 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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/hairsim/intern/audaspace/intern/AUD_FileFactory.cpp
===================================================================
--- branches/hairsim/intern/audaspace/intern/AUD_FileFactory.cpp 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/intern/audaspace/intern/AUD_FileFactory.cpp 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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/hairsim/intern/ghost/CMakeLists.txt
===================================================================
--- branches/hairsim/intern/ghost/CMakeLists.txt 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/intern/ghost/CMakeLists.txt 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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)
+ELSEIF(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(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})
- 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)
+
+ 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/hairsim/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/hairsim/release/scripts/io/engine_render_pov.py 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/release/scripts/io/engine_render_pov.py 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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/hairsim/release/scripts/io/import_shape_mdd.py
===================================================================
--- branches/hairsim/release/scripts/io/import_shape_mdd.py 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/release/scripts/io/import_shape_mdd.py 2010-05-23 09:27:58 UTC (rev 28930)
@@ -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/hairsim/release/scripts/io/netrender/__init__.py
===================================================================
--- branches/hairsim/release/scripts/io/netrender/__init__.py 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/release/scripts/io/netrender/__init__.py 2010-05-23 09:27:58 UTC (rev 28930)
@@ -27,6 +27,7 @@
from netrender import utils
from netrender import balancing
from netrender import ui
+from netrender import repath
jobs = []
slaves = []
Modified: branches/hairsim/release/scripts/io/netrender/model.py
===================================================================
--- branches/hairsim/release/scripts/io/netrender/model.py 2010-05-23 08:08:27 UTC (rev 28929)
+++ branches/hairsim/release/scripts/io/netrender/model.py 2010-05-23 09:27:58 UTC (rev 28930)
@@ -105,6 +105,7 @@
class RenderFile:
def __init__(self, filepath = "", index = 0, start = -1, end = -1, signature=0):
self.filepath = filepath
+ self.original_path = filepath
self.signature = signature
self.index = index
self.start = start
@@ -113,6 +114,7 @@
def serialize(self):
return {
"filepath": self.filepath,
+ "original_path": self.original_path,
"index": self.index,
"start": self.start,
"end": self.end,
@@ -125,6 +127,7 @@
return None
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list