Revision: 38713
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38713
Author: campbellbarton
Date: 2011-07-26 03:14:16 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
svn merge -r38300:38400 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38300
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/doc/python_api/examples/bge.texture.py
branches/bmesh/blender/doc/python_api/rst/bgl.rst
branches/bmesh/blender/intern/CMakeLists.txt
branches/bmesh/blender/intern/ghost/CMakeLists.txt
branches/bmesh/blender/intern/ghost/GHOST_Types.h
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_Debug.h
branches/bmesh/blender/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_EventPrinter.h
branches/bmesh/blender/intern/ghost/intern/GHOST_ISystem.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/bmesh/blender/intern/smoke/CMakeLists.txt
branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/avi/AVI_avi.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/editors/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/datafiles/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/datafiles/preview.blend.c
branches/bmesh/blender/source/blender/editors/render/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_context.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
branches/bmesh/blender/source/blender/editors/space_node/node_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/gpu/CMakeLists.txt
branches/bmesh/blender/source/blender/gpu/SConscript
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/bmesh/blender/source/blender/nodes/intern/CMP_util.c
branches/bmesh/blender/source/blender/python/generic/bgl.c
branches/bmesh/blender/source/blender/python/generic/mathutils.c
branches/bmesh/blender/source/blender/python/generic/mathutils_Color.c
branches/bmesh/blender/source/blender/python/generic/mathutils_Euler.c
branches/bmesh/blender/source/blender/python/generic/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/generic/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/generic/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c
branches/bmesh/blender/source/blender/render/CMakeLists.txt
branches/bmesh/blender/source/blender/render/SConscript
branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
Added Paths:
-----------
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_DisplayManagerSDL.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowSDL.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-38300
+ /trunk/blender:31524-38400
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-07-26 03:00:55 UTC (rev
38712)
+++ branches/bmesh/blender/CMakeLists.txt 2011-07-26 03:14:16 UTC (rev
38713)
@@ -90,6 +90,9 @@
get_blender_version()
# Blender internal features
+option(WITH_BLENDER "Build blender (disable to build only the blender player)"
ON)
+mark_as_advanced(WITH_BLENDER)
+
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
option(WITH_PYTHON "Enable Embedded Python API (only disable for
development)" ON)
@@ -106,12 +109,21 @@
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
-option(WITH_AUDASPACE "Build with blenders audio library" ON)
-mark_as_advanced(WITH_AUDASPACE)
+# GHOST Windowing Library Options
+option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
+mark_as_advanced(WITH_GHOST_DEBUG)
+option(WITH_GHOST_SDL "Enable building blender against SDL for windowing
rather then the native APIs" OFF)
+mark_as_advanced(WITH_GHOST_SDL)
+
+# Misc...
option(WITH_HEADLESS "Build without graphical support (renderfarm, server
mode only)" OFF)
mark_as_advanced(WITH_HEADLESS)
+option(WITH_AUDASPACE "Build with blenders audio library (only disable if
you know what you're doing!)" ON)
+mark_as_advanced(WITH_AUDASPACE)
+
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" ON)
@@ -129,6 +141,7 @@
# Modifiers
option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
option(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
option(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
option(WITH_MOD_CLOTH_ELTOPO "Enable Experemental cloth solver" OFF)
@@ -201,6 +214,10 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
+ message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must
be enabled, nothing to do!")
+endif()
+
if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
@@ -209,6 +226,10 @@
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG
require WITH_AUDASPACE")
endif()
+if(NOT WITH_SDL AND WITH_GHOST_SDL)
+ message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
+endif()
+
if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
endif()
@@ -433,7 +454,7 @@
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using
--as-needed
set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(NOT WITH_HEADLESS)
+ if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL))
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
@@ -1210,7 +1231,9 @@
#-----------------------------------------------------------------------------
# Blender Application
-add_subdirectory(source/creator)
+if(WITH_BLENDER)
+ add_subdirectory(source/creator)
+endif()
#-----------------------------------------------------------------------------
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-07-26
03:00:55 UTC (rev 38712)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-07-26
03:14:16 UTC (rev 38713)
@@ -121,6 +121,7 @@
'BF_OPENMP_INC',
'BF_OPENMP_LIBPATH',
'WITH_GHOST_COCOA',
+ 'WITH_GHOST_SDL',
'USE_QTKIT',
'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
'BF_X264_CONFIG',
@@ -385,6 +386,7 @@
('BF_OPENMP_INC', 'Path to OpenMP includes (used when cross-compiling
with older versions of WinGW)', ''),
('BF_OPENMP_LIBPATH', 'Path to OpenMP libraries (used when
cross-compiling with older versions of WinGW)', ''),
(BoolVariable('WITH_GHOST_COCOA', 'Use Cocoa-framework if true',
False)),
+ (BoolVariable('WITH_GHOST_SDL', 'Enable building blender against SDL
for windowing rather then the native APIs', False)),
(BoolVariable('USE_QTKIT', 'Use QTKIT if true', False)),
(BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),
Modified: branches/bmesh/blender/doc/python_api/examples/bge.texture.py
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/bge.texture.py
2011-07-26 03:00:55 UTC (rev 38712)
+++ branches/bmesh/blender/doc/python_api/examples/bge.texture.py
2011-07-26 03:14:16 UTC (rev 38713)
@@ -29,4 +29,4 @@
logic.video.source.play()
# you need to call this function every frame to ensure update of the texture.
-logic.video.refresh(True)
\ No newline at end of file
+logic.video.refresh(True)
Modified: branches/bmesh/blender/doc/python_api/rst/bgl.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bgl.rst 2011-07-26 03:00:55 UTC
(rev 38712)
+++ branches/bmesh/blender/doc/python_api/rst/bgl.rst 2011-07-26 03:14:16 UTC
(rev 38713)
@@ -1379,16 +1379,17 @@
.. code-block:: python
- import Blender
- from Blender.BGL import *
+ import bgl
xval, yval= 100, 40
# Get the scale of the view matrix
- viewMatrix = Buffer(GL_FLOAT, 16)
- glGetFloatv(GL_MODELVIEW_MATRIX, viewMatrix)
- f = 1/viewMatrix[0]
- glRasterPos2f(xval*f, yval*f) # Instead of the usual
glRasterPos2i(xval, yval)
+ view_matrix = bgl.Buffer(bgl.GL_FLOAT, 16)
+ bgl.glGetFloatv(bgl.GL_MODELVIEW_MATRIX, view_matrix)
+ f = 1.0 / view_matrix[0]
+ # Instead of the usual glRasterPos2i(xval, yval)
+ bgl.glRasterPos2f(xval * f, yval * f)
+
.. function:: glReadBuffer(mode):
Select a color buffer source for pixels.
@@ -1839,32 +1840,32 @@
The Buffer object is simply a block of memory that is delineated and
initialized by the
user. Many OpenGL functions return data to a C-style pointer, however,
because this
is not possible in python the Buffer object can be used to this end.
Wherever pointer
- notation is used in the OpenGL functions the Buffer object can be used in
it's BGL
+ notation is used in the OpenGL functions the Buffer object can be used in
it's bgl
wrapper. In some instances the Buffer object will need to be initialized
with the template
parameter, while in other instances the user will want to create just a
blank buffer
which will be zeroed by default.
- Example with Buffer::
- import Blender
- from Blender import BGL
- myByteBuffer = BGL.Buffer(BGL.GL_BYTE, [32,32])
- BGL.glGetPolygonStipple(myByteBuffer)
- print myByteBuffer.dimensions
- print myByteBuffer.list
+ .. code-block:: python
+
+ import bgl
+ myByteBuffer = bgl.Buffer(bgl.GL_BYTE, [32, 32])
+ bgl.glGetPolygonStipple(myByteBuffer)
+ print(myByteBuffer.dimensions)
+ print(myByteBuffer.to_list())
sliceBuffer = myByteBuffer[0:16]
- print sliceBuffer
+ print(sliceBuffer)
- .. attribute:: list
+ .. attribute:: dimensions
- The contents of the Buffer.
+ The number of dimensions of the Buffer.
- .. attribute:: dimensions
+ .. method:: to_list()
- The size of the Buffer.
+ The contents of the Buffer as a python list.
.. method:: __init__(type, dimensions, template = None):
- This will create a new Buffer object for use with other BGL OpenGL
commands.
+ This will create a new Buffer object for use with other bgl OpenGL
commands.
Only the type of argument to store in the buffer and the dimensions of
the buffer
are necessary. Buffers are zeroed by default unless a template is
supplied, in
which case the buffer is initialized to the template.
Modified: branches/bmesh/blender/intern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/CMakeLists.txt 2011-07-26 03:00:55 UTC
(rev 38712)
+++ branches/bmesh/blender/intern/CMakeLists.txt 2011-07-26 03:14:16 UTC
(rev 38713)
@@ -31,7 +31,6 @@
add_subdirectory(memutil)
add_subdirectory(iksolver)
add_subdirectory(opennl)
-add_subdirectory(smoke)
add_subdirectory(mikktspace)
if(WITH_AUDASPACE)
@@ -42,6 +41,10 @@
add_subdirectory(elbeem)
endif()
+if(WITH_MOD_SMOKE)
+ add_subdirectory(smoke)
+endif()
+
if(WITH_MOD_DECIMATE)
add_subdirectory(container)
add_subdirectory(decimation)
Modified: branches/bmesh/blender/intern/ghost/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/ghost/CMakeLists.txt 2011-07-26 03:00:55 UTC
(rev 38712)
+++ branches/bmesh/blender/intern/ghost/CMakeLists.txt 2011-07-26 03:14:16 UTC
(rev 38713)
@@ -42,7 +42,6 @@
intern/GHOST_Path-api.cpp
intern/GHOST_DisplayManager.cpp
intern/GHOST_EventManager.cpp
- intern/GHOST_EventPrinter.cpp
intern/GHOST_ISystem.cpp
intern/GHOST_ISystemPaths.cpp
intern/GHOST_ModifierKeys.cpp
@@ -75,7 +74,6 @@
intern/GHOST_EventKey.h
intern/GHOST_EventManager.h
intern/GHOST_EventNDOF.h
- intern/GHOST_EventPrinter.h
intern/GHOST_EventString.h
intern/GHOST_EventTrackpad.h
intern/GHOST_EventWheel.h
@@ -89,14 +87,38 @@
intern/GHOST_WindowManager.h
)
-if(WITH_HEADLESS)
+if(WITH_GHOST_DEBUG)
list(APPEND SRC
- intern/GHOST_DisplayManagerNULL.h
- intern/GHOST_SystemNULL.h
- intern/GHOST_WindowNULL.h
+ intern/GHOST_EventPrinter.cpp
+
+ intern/GHOST_EventPrinter.h
)
- add_definitions(-DWITH_HEADLESS)
+ add_definitions(-DWITH_GHOST_DEBUG)
+endif()
+
+if(WITH_HEADLESS OR WITH_GHOST_SDL)
+ if(WITH_HEADLESS)
+ list(APPEND SRC
+ intern/GHOST_DisplayManagerNULL.h
+ intern/GHOST_SystemNULL.h
+ intern/GHOST_WindowNULL.h
+ )
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
