[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29913] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29790 :29912
Nicholas Bishop
nicholasbishop at gmail.com
Sun Jul 4 04:08:48 CEST 2010
Revision: 29913
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29913
Author: nicholasbishop
Date: 2010-07-04 04:08:39 +0200 (Sun, 04 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29790:29912
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/config/darwin-config.py
branches/soc-2010-nicolasbishop/release/scripts/io/engine_render_pov.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/modules/add_object_utils.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_align.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_image.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/bpath.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editfont.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_opengl.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_shading.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screendump.c
branches/soc-2010-nicolasbishop/source/blender/editors/sound/sound_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/info_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/text_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_group.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/bgl.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/blf_api.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nicolasbishop/source/blender/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/rayshade.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_api.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_api_cleanup.txt
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-04 02:08:39 UTC (rev 29913)
@@ -228,6 +228,10 @@
/opt/include/OpenEXR
)
SET(OPENEXR_LIB Half IlmImf Iex Imath)
+
+ IF(NOT OPENEXR_INC)
+ SET(WITH_OPENEXR OFF)
+ ENDIF(NOT OPENEXR_INC)
ENDIF(WITH_OPENEXR)
IF(WITH_TIFF)
@@ -304,6 +308,10 @@
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
+ IF(WITH_RAYOPTIMIZATION)
+ SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
+ ENDIF(WITH_RAYOPTIMIZATION)
+
SET(PLATFORM_LINKFLAGS "-pthread")
# Better warnings
@@ -707,7 +715,12 @@
SET(OPENEXR_LIBPATH ${OPENEXR}/lib)
ENDIF(WITH_OPENEXR)
- # TODO: IF(WITH_LCMS)
+ IF(WITH_LCMS)
+ SET(LCMS ${LIBDIR}/lcms)
+ SET(LCMS_INCLUDE_DIR ${LCMS}/include)
+ SET(LCMS_LIBRARY lcms)
+ SET(LCMS_LIBPATH ${LCMS}/lib)
+ ENDIF(WITH_LCMS)
IF(WITH_FFMPEG)
SET(FFMPEG ${LIBDIR}/ffmpeg)
Modified: branches/soc-2010-nicolasbishop/config/darwin-config.py
===================================================================
--- branches/soc-2010-nicolasbishop/config/darwin-config.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/config/darwin-config.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -151,6 +151,13 @@
WITH_BF_DDS = True
+#Color Management System
+WITH_BF_LCMS = False
+BF_LCMS = LIBDIR + '/lcms'
+BF_LCMS_INC = '${BF_LCMS}/include'
+BF_LCMS_LIB = 'lcms'
+BF_LCMS_LIBPATH = '${BF_LCMS}/lib'
+
WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/engine_render_pov.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/engine_render_pov.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/engine_render_pov.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -134,7 +134,7 @@
def exportCamera():
camera = scene.camera
- matrix = camera.matrix
+ matrix = camera.matrix_world
# compute resolution
Qsize = float(render.resolution_x) / float(render.resolution_y)
@@ -155,7 +155,7 @@
for ob in lamps:
lamp = ob.data
- matrix = ob.matrix
+ matrix = ob.matrix_world
color = tuple([c * lamp.energy for c in lamp.color]) # Colour is modified by energy
@@ -263,7 +263,7 @@
writeObjectMaterial(material)
- writeMatrix(ob.matrix)
+ writeMatrix(ob.matrix_world)
file.write('}\n')
@@ -292,7 +292,7 @@
# continue
# me = ob.data
- matrix = ob.matrix
+ matrix = ob.matrix_world
try:
uv_layer = me.active_uv_texture.data
except:
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -82,7 +82,7 @@
ob.create_dupli_list(scene)
return True, [(dob.object, dob.matrix) for dob in ob.dupli_list]
else:
- return False, [(ob, ob.matrix)]
+ return False, [(ob, ob.matrix_world)]
# also used by X3D exporter
def free_derived_objects(ob):
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -528,7 +528,7 @@
self.fbxGroupNames = []
self.fbxParent = None # set later on IF the parent is in the selection.
if matrixWorld: self.matrixWorld = GLOBAL_MATRIX * matrixWorld
- else: self.matrixWorld = GLOBAL_MATRIX * ob.matrix
+ else: self.matrixWorld = GLOBAL_MATRIX * ob.matrix_world
# else: self.matrixWorld = ob.matrixWorld * GLOBAL_MATRIX
self.__anim_poselist = {} # we should only access this
@@ -539,8 +539,7 @@
return self.matrixWorld
def setPoseFrame(self, f):
- self.__anim_poselist[f] = self.blenObject.matrix.copy()
-# self.__anim_poselist[f] = self.blenObject.matrixWorld.copy()
+ self.__anim_poselist[f] = self.blenObject.matrix_world.copy()
def getAnimParRelMatrix(self, frame):
if self.fbxParent:
@@ -646,7 +645,7 @@
else:
# This is bad because we need the parent relative matrix from the fbx parent (if we have one), dont use anymore
- #if ob and not matrix: matrix = ob.matrixWorld * GLOBAL_MATRIX
+ #if ob and not matrix: matrix = ob.matrix_world * GLOBAL_MATRIX
if ob and not matrix: raise Exception("error: this should never happen!")
matrix_rot = matrix
@@ -2025,7 +2024,7 @@
if ob_base.parent and ob_base.parent.dupli_type != 'NONE':
continue
- obs = [(ob_base, ob_base.matrix)]
+ obs = [(ob_base, ob_base.matrix_world)]
if ob_base.dupli_type != 'NONE':
ob_base.create_dupli_list(scene)
obs = [(dob.object, dob.matrix) for dob in ob_base.dupli_list]
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -113,7 +113,7 @@
"""
check_vertcount(me, numverts)
- me.transform(mat_flip * ob.matrix)
+ me.transform(mat_flip * ob.matrix_world)
f.write(pack(">%df" % (numverts * 3), *[axis for v in me.verts for axis in v.co]))
for frame in range(PREF_STARTFRAME, PREF_ENDFRAME + 1):#in order to start at desired frame
@@ -125,7 +125,7 @@
sce.set_frame(frame)
me = ob.create_mesh(sce, True, 'PREVIEW')
check_vertcount(me, numverts)
- me.transform(mat_flip * ob.matrix)
+ me.transform(mat_flip * ob.matrix_world)
# Write the vertex data
f.write(pack(">%df" % (numverts * 3), *[axis for v in me.verts for axis in v.co]))
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -403,7 +403,7 @@
# XXX debug print
print(ob_main.name, 'has', len(obs), 'dupli children')
else:
- obs = [(ob_main, ob_main.matrix)]
+ obs = [(ob_main, ob_main.matrix_world)]
for ob, ob_mat in obs:
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -111,7 +111,7 @@
raise ("Error, could not get mesh data from active object")
return
- # mesh.transform(ob.matrixWorld) # XXX
+ # mesh.transform(ob.matrix_world) # XXX
faceUV = (len(mesh.uv_textures) > 0)
vertexUV = (len(mesh.sticky) > 0)
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py 2010-07-04 01:56:04 UTC (rev 29912)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py 2010-07-04 02:08:39 UTC (rev 29913)
@@ -237,7 +237,7 @@
lens = min(lens, math.pi)
# get the camera location, subtract 90 degress from X to orient like X3D does
- # mat = ob.matrixWorld - mat is now passed!
+ # mat = ob.matrix_world - mat is now passed!
loc = self.rotatePointForVRML(mat.translation_part())
rot = mat.to_euler()
@@ -300,7 +300,7 @@
# note -dz seems to equal om[3][1]
# note dy seems to equal om[3][2]
- #location=(ob.matrixWorld*MATWORLD).translation_part() # now passed
+ #location=(ob.matrix_world*MATWORLD).translation_part() # now passed
location=(mtx*MATWORLD).translation_part()
radius = lamp.distance*math.cos(beamWidth)
@@ -346,7 +346,7 @@
ambi = 0
ambientIntensity = 0
- # location=(ob.matrixWorld*MATWORLD).translation_part() # now passed
+ # location=(ob.matrix_world*MATWORLD).translation_part() # now passed
location= (mtx*MATWORLD).translation_part()
self.file.write("<PointLight DEF=\"%s\" " % safeName)
@@ -364,7 +364,7 @@
return
else:
dx,dy,dz = self.computeDirection(mtx)
- # location=(ob.matrixWorld*MATWORLD).translation_part()
+ # location=(ob.matrix_world*MATWORLD).translation_part()
location=(mtx*MATWORLD).translation_part()
self.writeIndented("<%s\n" % obname,1)
self.writeIndented("direction=\"%s %s %s\"\n" % (round(dx,3),round(dy,3),round(dz,3)))
@@ -445,7 +445,7 @@
else:
bTwoSided=0
- # mtx = ob.matrixWorld * MATWORLD # mtx is now passed
+ # mtx = ob.matrix_world * MATWORLD # mtx is now passed
mtx = mtx * MATWORLD
loc= mtx.translation_part()
@@ -601,7 +601,7 @@
self.file.write("\">\n")
else:
#-- vertices
- # mesh.transform(ob.matrixWorld)
+ # mesh.transform(ob.matrix_world)
self.writeIndented("<Coordinate DEF=\"%s%s\" \n" % ("coord_",meshName), 1)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list