[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15585] branches/soc-2008-jaguarandi: There was a problem with the last merge :S
André Pinto
andresusanopinto at gmail.com
Tue Jul 15 14:54:57 CEST 2008
Revision: 15585
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15585
Author: jaguarandi
Date: 2008-07-15 14:54:57 +0200 (Tue, 15 Jul 2008)
Log Message:
-----------
There was a problem with the last merge :S
Somehow it didnt finished and didnt added some files under the svn control
(found thanks to lguillaume that reported some files were missing)
Last merge fixed and also merged modifications up to revision 15584.
I checked the diff
svn diff --new . --old https://svn.blender.org/svnroot/bf-blender/trunk/blender
And everything seems to be right now
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15584
Modified Paths:
--------------
branches/soc-2008-jaguarandi/CMakeLists.txt
branches/soc-2008-jaguarandi/intern/bsp/intern/BSP_CSGMesh.cpp
branches/soc-2008-jaguarandi/intern/container/CTR_TaggedIndex.h
branches/soc-2008-jaguarandi/intern/decimation/intern/LOD_ManMesh2.cpp
branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_init.cpp
branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-jaguarandi/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-jaguarandi/source/blender/render/intern/source/zbuf.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_SoundActuator.cpp
Added Paths:
-----------
branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-jaguarandi/source/blender/render/intern/include/sunsky.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/sunsky.c
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.h
Modified: branches/soc-2008-jaguarandi/CMakeLists.txt
===================================================================
--- branches/soc-2008-jaguarandi/CMakeLists.txt 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/CMakeLists.txt 2008-07-15 12:54:57 UTC (rev 15585)
@@ -197,10 +197,17 @@
ENDIF(UNIX)
IF(WIN32)
+
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
-
+
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+ # Setup 64bit and 64bit windows systems
+ IF(CMAKE_CL_64)
+ message("64 bit compiler detected.")
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+ ENDIF(CMAKE_CL_64)
+
SET(PYTHON ${LIBDIR}/python)
SET(PYTHON_VERSION 2.5)
SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
@@ -214,12 +221,20 @@
SET(OPENAL_LIB openal_static)
SET(OPENAL_LIBPATH ${OPENAL}/lib)
- SET(PNG_LIB libpng_st)
+ IF(CMAKE_CL_64)
+ SET(PNG_LIB libpng)
+ ELSE(CMAKE_CL_64)
+ SET(PNG_LIB libpng_st)
+ ENDIF(CMAKE_CL_64)
SET(JPEG_LIB libjpeg)
SET(ZLIB ${LIBDIR}/zlib)
SET(ZLIB_INC ${ZLIB}/include)
- SET(ZLIB_LIB libz)
+ IF(CMAKE_CL_64)
+ SET(ZLIB_LIB zlib)
+ ELSE(CMAKE_CL_64)
+ SET(ZLIB_LIB libz)
+ ENDIF(CMAKE_CL_64)
SET(ZLIB_LIBPATH ${ZLIB}/lib)
SET(PTHREADS ${LIBDIR}/pthreads)
@@ -302,7 +317,11 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
- SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
+ IF(CMAKE_CL_64)
+ SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ ELSE(CMAKE_CL_64)
+ SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
ENDIF(WIN32)
Modified: branches/soc-2008-jaguarandi/intern/bsp/intern/BSP_CSGMesh.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/bsp/intern/BSP_CSGMesh.cpp 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/bsp/intern/BSP_CSGMesh.cpp 2008-07-15 12:54:57 UTC (rev 15585)
@@ -197,7 +197,7 @@
for (int vert = 0; vert < vertex_num; ++vert) {
- BSP_FaceInd fi(f_it - f_it_begin);
+ BSP_FaceInd fi(size_t (f_it - f_it_begin));
InsertEdge(prev_vi,face.m_verts[vert],fi,dummy);
prev_vi = face.m_verts[vert];
}
Modified: branches/soc-2008-jaguarandi/intern/container/CTR_TaggedIndex.h
===================================================================
--- branches/soc-2008-jaguarandi/intern/container/CTR_TaggedIndex.h 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/container/CTR_TaggedIndex.h 2008-07-15 12:54:57 UTC (rev 15585)
@@ -93,7 +93,17 @@
}
+#if defined(_WIN64)
CTR_TaggedIndex(
+ const unsigned __int64 val
+ ) :
+ m_val ( ((unsigned __int64)val & index_mask)
+ | ( (empty_tag << tag_shift)
+ & (~index_mask) ) ) {
+ }
+#endif
+
+ CTR_TaggedIndex(
const CTR_TaggedIndex &my_index
):
m_val(my_index.m_val)
@@ -124,6 +134,12 @@
return (long int)(m_val & index_mask);
}
+#if defined(_WIN64)
+ operator unsigned __int64 () const {
+ return (unsigned __int64)(m_val & index_mask);
+ }
+#endif
+
bool
IsEmpty(
) const {
Modified: branches/soc-2008-jaguarandi/intern/decimation/intern/LOD_ManMesh2.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/decimation/intern/LOD_ManMesh2.cpp 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/decimation/intern/LOD_ManMesh2.cpp 2008-07-15 12:54:57 UTC (rev 15585)
@@ -477,7 +477,7 @@
return;
}
- LOD_VertexInd last = LOD_VertexInd(verts.end() - verts.begin() - 1);
+ LOD_VertexInd last = LOD_VertexInd(size_t(verts.end() - verts.begin() - 1));
if (!(last == v)) {
@@ -533,7 +533,7 @@
return;
}
- LOD_EdgeInd last = LOD_EdgeInd(edges.end() - edges.begin() - 1);
+ LOD_EdgeInd last = LOD_EdgeInd(size_t(edges.end() - edges.begin() - 1));
if (!(last == e)) {
vector<LOD_EdgeInd> e_verts;
@@ -573,7 +573,7 @@
return;
}
- LOD_FaceInd last = LOD_FaceInd(faces.end() - faces.begin() - 1);
+ LOD_FaceInd last = LOD_FaceInd(size_t (faces.end() - faces.begin() - 1));
if (!(last == f)) {
Modified: branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_init.cpp 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/elbeem/intern/solver_init.cpp 2008-07-15 12:54:57 UTC (rev 15585)
@@ -694,7 +694,7 @@
double maxDefaultMemChunk = 2.*1024.*1024.*1024.;
//std::cerr<<" memEstFine "<< memEstFine <<" maxWin:" <<maxWinMemChunk <<" maxMac:" <<maxMacMemChunk ; // DEBUG
#ifdef WIN32
- if(memEstFine> maxWinMemChunk) {
+ if(sizeof(void *)==4 && memEstFine>maxWinMemChunk) {
memBlockAllocProblem = true;
}
#endif // WIN32
Modified: branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-15 12:54:57 UTC (rev 15585)
@@ -42,6 +42,14 @@
#include "GHOST_SystemWin32.h"
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
/*
* According to the docs the mouse wheel message is supported from windows 98
* upwards. Leaving WINVER at default value, the WM_MOUSEWHEEL message and the
Modified: branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-15 09:19:56 UTC (rev 15584)
+++ branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_WindowWin32.cpp 2008-07-15 12:54:57 UTC (rev 15585)
@@ -48,6 +48,14 @@
#define M_PI 3.1415926536
#endif
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
LPCSTR GHOST_WindowWin32::s_windowClassName = "GHOST_WindowClass";
const int GHOST_WindowWin32::s_maxTitleLength = 128;
HGLRC GHOST_WindowWin32::s_firsthGLRc = NULL;
Added: branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py (rev 0)
+++ branches/soc-2008-jaguarandi/release/scripts/scripttemplate_ipo_gen.py 2008-07-15 12:54:57 UTC (rev 15585)
@@ -0,0 +1,92 @@
+#!BPY
+"""
+Name: 'Camera/Object Example'
+Blender: 245
+Group: 'ScriptTemplate'
+Tooltip: 'Script template for setting the camera direction'
+"""
+
+from Blender import Window
+import bpy
+
+script_data = \
+'''#!BPY
+"""
+Name: 'My Ipo Script'
+Blender: 245
+Group: 'Animation'
+Tooltip: 'Put some useful info here'
+"""
+
+# Add a licence here if you wish to re-distribute, we recommend the GPL
+
+from Blender import Ipo, Mathutils, Window
+import bpy, BPyMessages
+
+def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep):
+ # Create an new Ipo Curve of name myIpo and type Object
+ myIpo = bpy.data.ipos.new('myIpo', 'Object')
+
+ # Create LocX, LocY, and LocZ Ipo curves in our new Curve Object
+ # and store them so we can access them later
+ myIpo_x = myIpo.addCurve('LocX')
+ myIpo_y = myIpo.addCurve('LocY')
+ myIpo_z = myIpo.addCurve('LocZ')
+
+ # What value we want to scale our random value by
+ ipoScale = 4
+
+ # This Calculates the End Frame for use in an xrange() expression
+ endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep
+
+ for frame in xrange(firstFrame, endFrame, frameStep):
+
+ # Use the Mathutils Rand() function to get random numbers
+ ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale
+ ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale
+ ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale
+
+ # Append to the Ipo curve at location frame, with the value ipoValue_x
+ # Note that we should pass the append function a tuple or a BezTriple
+ myIpo_x.append((frame, ipoValue_x))
+
+ # Similar to above
+ myIpo_y.append((frame, ipoValue_y))
+ myIpo_z.append((frame, ipoValue_z))
+
+ # Link our new Ipo Curve to the passed object
+ object.setIpo(myIpo)
+ print object
+
+
+def main():
+
+ # Get the active scene, since there can be multiple ones
+ sce = bpy.data.scenes.active
+
+ # Get the active object
+ object = sce.objects.active
+
+ # If there is no active object, pop up an error message
+ if not object:
+ BPyMessages.Error_NoActive()
+
+ Window.WaitCursor(1)
+
+ # Call our makeRandomIpo function
+ # Pass it our object, Tell it to keys from the start frame until the end frame, at a step of 10 frames
+ # between them
+
+ makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10)
+
+ Window.WaitCursor(0)
+
+if __name__ == '__main__':
+ main()
+
+'''
+
+new_text = bpy.data.texts.new('ipo_template.py')
+new_text.write(script_data)
+bpy.data.texts.active = new_text
+Window.RedrawAll()
Added: branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h (rev 0)
+++ branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_mempool.h 2008-07-15 12:54:57 UTC (rev 15585)
@@ -0,0 +1,44 @@
+/**
+ * Simple fast memory allocator
+ *
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list