[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13358] branches/cloth/blender: svn merge -r 13323:13357 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Daniel Genrich daniel.genrich at gmx.net
Tue Jan 22 21:35:37 CET 2008


Revision: 13358
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13358
Author:   genscher
Date:     2008-01-22 21:35:37 +0100 (Tue, 22 Jan 2008)

Log Message:
-----------
svn merge -r 13323:13357 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/cloth/blender/CMakeLists.txt
    branches/cloth/blender/extern/CMakeLists.txt
    branches/cloth/blender/extern/binreloc/CMakeLists.txt
    branches/cloth/blender/projectfiles_vc7/blender/render/BRE_render.vcproj
    branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/cloth/blender/release/scripts/object_drop.py
    branches/cloth/blender/source/Makefile
    branches/cloth/blender/source/blender/blenkernel/BKE_anim.h
    branches/cloth/blender/source/blender/blenkernel/BKE_group.h
    branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
    branches/cloth/blender/source/blender/blenkernel/intern/anim.c
    branches/cloth/blender/source/blender/blenkernel/intern/group.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
    branches/cloth/blender/source/blender/blenlib/BLI_blenlib.h
    branches/cloth/blender/source/blender/blenlib/CMakeLists.txt
    branches/cloth/blender/source/blender/blenlib/intern/bpath.c
    branches/cloth/blender/source/blender/blenlib/intern/storage.c
    branches/cloth/blender/source/blender/include/BIF_editaction.h
    branches/cloth/blender/source/blender/include/BIF_editview.h
    branches/cloth/blender/source/blender/include/BIF_poseobject.h
    branches/cloth/blender/source/blender/include/BSE_drawipo.h
    branches/cloth/blender/source/blender/makesdna/DNA_node_types.h
    branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
    branches/cloth/blender/source/blender/python/api2_2x/doc/LibData.py
    branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
    branches/cloth/blender/source/blender/render/intern/include/render_types.h
    branches/cloth/blender/source/blender/render/intern/source/convertblender.c
    branches/cloth/blender/source/blender/render/intern/source/occlusion.c
    branches/cloth/blender/source/blender/render/intern/source/pipeline.c
    branches/cloth/blender/source/blender/render/intern/source/rayshade.c
    branches/cloth/blender/source/blender/render/intern/source/raytrace.c
    branches/cloth/blender/source/blender/render/intern/source/rendercore.c
    branches/cloth/blender/source/blender/render/intern/source/shadbuf.c
    branches/cloth/blender/source/blender/render/intern/source/shadeoutput.c
    branches/cloth/blender/source/blender/render/intern/source/strand.c
    branches/cloth/blender/source/blender/render/intern/source/texture.c
    branches/cloth/blender/source/blender/render/intern/source/zbuf.c
    branches/cloth/blender/source/blender/src/buttons_editing.c
    branches/cloth/blender/source/blender/src/buttons_object.c
    branches/cloth/blender/source/blender/src/buttons_scene.c
    branches/cloth/blender/source/blender/src/drawipo.c
    branches/cloth/blender/source/blender/src/drawnode.c
    branches/cloth/blender/source/blender/src/drawtime.c
    branches/cloth/blender/source/blender/src/editaction.c
    branches/cloth/blender/source/blender/src/editipo.c
    branches/cloth/blender/source/blender/src/editseq.c
    branches/cloth/blender/source/blender/src/editview.c
    branches/cloth/blender/source/blender/src/header_view3d.c
    branches/cloth/blender/source/blender/src/meshlaplacian.c
    branches/cloth/blender/source/blender/src/outliner.c
    branches/cloth/blender/source/blender/src/poseobject.c
    branches/cloth/blender/source/blender/src/sculptmode.c
    branches/cloth/blender/source/blender/src/space.c
    branches/cloth/blender/source/blender/src/toolbox.c
    branches/cloth/blender/source/blender/src/transform.c
    branches/cloth/blender/source/blender/yafray/intern/export_File.cpp
    branches/cloth/blender/source/blender/yafray/intern/export_File.h
    branches/cloth/blender/source/blender/yafray/intern/export_Plugin.cpp
    branches/cloth/blender/source/blender/yafray/intern/export_Plugin.h
    branches/cloth/blender/source/blender/yafray/intern/yafray_Render.cpp
    branches/cloth/blender/source/blender/yafray/intern/yafray_Render.h
    branches/cloth/blender/source/creator/CMakeLists.txt

Added Paths:
-----------
    branches/cloth/blender/release/scripts/object_timeofs_follow_act.py
    branches/cloth/blender/source/blender/blenkernel/BKE_collision.h

Modified: branches/cloth/blender/CMakeLists.txt
===================================================================
--- branches/cloth/blender/CMakeLists.txt	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/CMakeLists.txt	2008-01-22 20:35:37 UTC (rev 13358)
@@ -68,7 +68,6 @@
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
-OPTION(WITH_BINRELOC		"Enable binreloc filepath support"				OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -265,9 +264,6 @@
   SET(FFMPEG_LIB avcodec-51 avformat-51 avutil-49)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
-  SET(BINRELC ${LIBDIR}/binreloc)
-  SET(BINRELC_INC ${BINRELOC}/include)
-
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   IF(WITH_OPENAL)
     SET(LLIBS ${LLIBS} dxguid)
@@ -389,6 +385,11 @@
   SET(EXETYPE MACOSX_BUNDLE)
 ENDIF(APPLE)
 
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+  SET(BINRELOC_INC ${BINRELOC}/include)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
 #-----------------------------------------------------------------------------
 # Common.
 SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)

Modified: branches/cloth/blender/extern/CMakeLists.txt
===================================================================
--- branches/cloth/blender/extern/CMakeLists.txt	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/extern/CMakeLists.txt	2008-01-22 20:35:37 UTC (rev 13358)
@@ -43,6 +43,6 @@
   SUBDIRS(verse)
 ENDIF(WITH_VERSE)
 
-if(WITH_BINRELOC)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SUBDIRS(binreloc)
-ENDIF(WITH_BINRELOC)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")

Modified: branches/cloth/blender/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/cloth/blender/extern/binreloc/CMakeLists.txt	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/extern/binreloc/CMakeLists.txt	2008-01-22 20:35:37 UTC (rev 13358)
@@ -22,5 +22,5 @@
 ADD_DEFINITIONS(-DWITH_BINRELOC)
 FILE(GLOB SRC *.c)
 
-BLENDERLIB(binreloc "${SRC}" "${INC}")
+BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
 #, libtype=['core','player'], priority = [25,15] ) 

Modified: branches/cloth/blender/projectfiles_vc7/blender/render/BRE_render.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/render/BRE_render.vcproj	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/projectfiles_vc7/blender/render/BRE_render.vcproj	2008-01-22 20:35:37 UTC (rev 13358)
@@ -137,6 +137,9 @@
 				RelativePath="..\..\..\source\blender\render\intern\source\initrender.c">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\occlusion.c">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\pipeline.c">
 			</File>
 			<File
@@ -195,6 +198,9 @@
 				RelativePath="..\..\..\source\blender\render\intern\include\initrender.h">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\occlusion.h">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\old_zbuffer_types.h">
 			</File>
 			<File

Modified: branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj	2008-01-22 20:35:37 UTC (rev 13358)
@@ -476,6 +476,9 @@
 				RelativePath="..\..\..\source\blender\src\prvicons.c">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\src\radialcontrol.c">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\src\reeb.c">
 			</File>
 			<File
@@ -753,6 +756,9 @@
 				RelativePath="..\..\..\source\blender\include\BIF_previewrender.h">
 			</File>
 			<File
+				RelativePath="..\..\..\source\blender\include\BIF_radialcontrol.h">
+			</File>
+			<File
 				RelativePath="..\..\..\source\blender\include\BIF_renderwin.h">
 			</File>
 			<File

Modified: branches/cloth/blender/release/scripts/object_drop.py
===================================================================
--- branches/cloth/blender/release/scripts/object_drop.py	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/release/scripts/object_drop.py	2008-01-22 20:35:37 UTC (rev 13358)
@@ -1,7 +1,7 @@
 #!BPY
 """
 Name: 'Drop Onto Ground'
-Blender: 243
+Blender: 245
 Group: 'Object'
 Tooltip: 'Drop the selected objects onto "ground" objects'
 """
@@ -221,4 +221,5 @@
 if __name__ == '__main__':
 	main()
 
-GLOBALS.clear()
\ No newline at end of file
+GLOBALS.clear()
+

Copied: branches/cloth/blender/release/scripts/object_timeofs_follow_act.py (from rev 13357, trunk/blender/release/scripts/object_timeofs_follow_act.py)
===================================================================
--- branches/cloth/blender/release/scripts/object_timeofs_follow_act.py	                        (rev 0)
+++ branches/cloth/blender/release/scripts/object_timeofs_follow_act.py	2008-01-22 20:35:37 UTC (rev 13358)
@@ -0,0 +1,107 @@
+#!BPY
+"""
+Name: 'TimeOffset follow Active'
+Blender: 245
+Group: 'Object'
+Tooltip: 'ActObs animated loc sets TimeOffset on other objects at closest frame'
+"""
+__author__= "Campbell Barton"
+__url__= ["blender.org", "blenderartists.org"]
+__version__= "1.0"
+
+__bpydoc__= """
+"""
+
+# --------------------------------------------------------------------------
+# TimeOffset follow Active v1.0 by Campbell Barton (AKA Ideasman42)
+# --------------------------------------------------------------------------
+# ***** 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.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+import Blender
+from Blender import Image, sys, Draw, Window, Scene, Group
+import bpy
+import BPyMessages
+
+
+def main():
+
+	sce = Scene.GetCurrent()
+
+	ob_act = sce.objects.active
+	 
+	if not ob_act:
+		Draw.PupMenu("Error%t|no active object")
+		return
+	
+	objects = list(sce.objects.context)
+	
+	try:	objects.remove(ob_act)
+	except: pass
+	
+	if not objects:
+		Draw.PupMenu("Error%t|no objects selected")
+		return
+	
+	curframe = Blender.Get('curframe')
+	
+	FRAME_START= Draw.Create( Blender.Get('staframe') )
+	FRAME_END= Draw.Create( Blender.Get('endframe') )
+		
+	# Get USER Options
+	pup_block= [\
+	('Start:', FRAME_START, 1, 300000, 'Use the active objects position starting at this frame'),\
+	('End:', FRAME_END, 1, 300000, 'Use the active objects position starting at this frame'),\
+	]
+	
+	if not Draw.PupBlock('Set timeoffset...', pup_block):
+		return
+	
+	FRAME_START = FRAME_START.val
+	FRAME_END = FRAME_END.val
+	
+	if FRAME_START >= FRAME_END:
+		Draw.PupMenu("Error%t|frames are not valid")
+	
+	
+	# Ok - all error checking 
+	locls_act = []
+	for f in xrange((FRAME_END-FRAME_START)):
+		i = FRAME_START+f
+		Blender.Set('curframe', i)
+		locls_act.append(ob_act.matrixWorld.translationPart())
+	
+	for ob in objects:
+		loc = ob.matrixWorld.translationPart()
+		best_frame = -1
+		best_dist = 100000000
+		for i, loc_act in enumerate(locls_act):
+			dist = (loc_act-loc).length
+			if dist < best_dist:
+				best_dist = dist
+				best_frame = i + FRAME_START
+		
+		ob.timeOffset = float(best_frame)
+	
+	# Set the original frame
+	Blender.Set('curframe', curframe)
+
+if __name__ == '__main__':
+	main()
+

Modified: branches/cloth/blender/source/Makefile
===================================================================
--- branches/cloth/blender/source/Makefile	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/source/Makefile	2008-01-22 20:35:37 UTC (rev 13358)
@@ -103,6 +103,8 @@
 COMLIB += $(OCGDIR)/blender/nodes/$(DEBUG_DIR)libnodes.a
 COMLIB += $(OCGDIR)/blender/imbuf/$(DEBUG_DIR)libimbuf.a
 COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
+COMLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
+COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a	
 COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
 COMLIB += $(NAN_JPEG)/lib/libjpeg.a
 

Modified: branches/cloth/blender/source/blender/blenkernel/BKE_anim.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_anim.h	2008-01-22 20:28:12 UTC (rev 13357)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_anim.h	2008-01-22 20:35:37 UTC (rev 13358)
@@ -46,7 +46,7 @@
 	struct DupliObject *next, *prev;
 	struct Object *ob;
 	unsigned int origlay;
-	int index, no_draw, type;
+	int index, no_draw, type, animated;
 	float mat[4][4], omat[4][4];
 	float orco[3], uv[2];
 } DupliObject;

Added: branches/cloth/blender/source/blender/blenkernel/BKE_collision.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_collision.h	                        (rev 0)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_collision.h	2008-01-22 20:35:37 UTC (rev 13358)
@@ -0,0 +1,175 @@
+/**
+ * BKE_cloth.h
+ *
+ * $Id: BKE_cloth.h,v 1.1 2007/08/01 02:07:27 daniel Exp $
+ *
+ * ***** BEGIN GPL/BL DUAL 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. The Blender

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list