[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12832] branches/animsys-aligorith: == AnimSys Branch ==
Joshua Leung
aligorith at gmail.com
Mon Dec 10 00:05:48 CET 2007
Revision: 12832
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12832
Author: aligorith
Date: 2007-12-10 00:05:47 +0100 (Mon, 10 Dec 2007)
Log Message:
-----------
== AnimSys Branch ==
Merge with trunk: r. 12765/6 - 12831 (HEAD)
Modified Paths:
--------------
branches/animsys-aligorith/extern/bFTGL/include/FTGL.h
branches/animsys-aligorith/extern/bFTGL/src/Makefile
branches/animsys-aligorith/intern/iksolver/intern/IK_QSegment.cpp
branches/animsys-aligorith/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/animsys-aligorith/release/Makefile
branches/animsys-aligorith/release/scripts/ply_export.py
branches/animsys-aligorith/release/scripts/wizard_curve2tree.py
branches/animsys-aligorith/source/Makefile
branches/animsys-aligorith/source/blender/Makefile
branches/animsys-aligorith/source/blender/blenkernel/BKE_blender.h
branches/animsys-aligorith/source/blender/blenkernel/BKE_mesh.h
branches/animsys-aligorith/source/blender/blenkernel/BKE_particle.h
branches/animsys-aligorith/source/blender/blenkernel/intern/DerivedMesh.c
branches/animsys-aligorith/source/blender/blenkernel/intern/action.c
branches/animsys-aligorith/source/blender/blenkernel/intern/anim.c
branches/animsys-aligorith/source/blender/blenkernel/intern/armature.c
branches/animsys-aligorith/source/blender/blenkernel/intern/constraint.c
branches/animsys-aligorith/source/blender/blenkernel/intern/curve.c
branches/animsys-aligorith/source/blender/blenkernel/intern/customdata.c
branches/animsys-aligorith/source/blender/blenkernel/intern/displist.c
branches/animsys-aligorith/source/blender/blenkernel/intern/image.c
branches/animsys-aligorith/source/blender/blenkernel/intern/lattice.c
branches/animsys-aligorith/source/blender/blenkernel/intern/material.c
branches/animsys-aligorith/source/blender/blenkernel/intern/mesh.c
branches/animsys-aligorith/source/blender/blenkernel/intern/modifier.c
branches/animsys-aligorith/source/blender/blenkernel/intern/object.c
branches/animsys-aligorith/source/blender/blenkernel/intern/particle.c
branches/animsys-aligorith/source/blender/blenkernel/intern/particle_system.c
branches/animsys-aligorith/source/blender/blenlib/BLI_rand.h
branches/animsys-aligorith/source/blender/blenlib/intern/arithb.c
branches/animsys-aligorith/source/blender/blenlib/intern/rand.c
branches/animsys-aligorith/source/blender/blenloader/intern/readfile.c
branches/animsys-aligorith/source/blender/ftfont/intern/Makefile
branches/animsys-aligorith/source/blender/include/BIF_editaction.h
branches/animsys-aligorith/source/blender/include/BIF_editparticle.h
branches/animsys-aligorith/source/blender/include/BIF_gl.h
branches/animsys-aligorith/source/blender/include/BIF_poseobject.h
branches/animsys-aligorith/source/blender/include/BSE_editipo.h
branches/animsys-aligorith/source/blender/include/blendef.h
branches/animsys-aligorith/source/blender/include/transform.h
branches/animsys-aligorith/source/blender/makesdna/DNA_action_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_armature_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_constraint_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_customdata_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_material_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_nla_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_object_types.h
branches/animsys-aligorith/source/blender/makesdna/DNA_particle_types.h
branches/animsys-aligorith/source/blender/nodes/intern/CMP_nodes/Makefile
branches/animsys-aligorith/source/blender/nodes/intern/Makefile
branches/animsys-aligorith/source/blender/nodes/intern/SHD_nodes/Makefile
branches/animsys-aligorith/source/blender/python/BPY_interface.c
branches/animsys-aligorith/source/blender/python/api2_2x/Armature.c
branches/animsys-aligorith/source/blender/python/api2_2x/CurNurb.c
branches/animsys-aligorith/source/blender/python/api2_2x/Lamp.c
branches/animsys-aligorith/source/blender/python/api2_2x/Object.c
branches/animsys-aligorith/source/blender/python/api2_2x/Window.c
branches/animsys-aligorith/source/blender/python/api2_2x/doc/Render.py
branches/animsys-aligorith/source/blender/python/api2_2x/sceneRender.c
branches/animsys-aligorith/source/blender/python/api2_2x/sceneSequence.c
branches/animsys-aligorith/source/blender/render/extern/include/RE_pipeline.h
branches/animsys-aligorith/source/blender/render/extern/include/RE_shader_ext.h
branches/animsys-aligorith/source/blender/render/intern/include/render_types.h
branches/animsys-aligorith/source/blender/render/intern/include/renderdatabase.h
branches/animsys-aligorith/source/blender/render/intern/include/shading.h
branches/animsys-aligorith/source/blender/render/intern/include/zbuf.h
branches/animsys-aligorith/source/blender/render/intern/source/convertblender.c
branches/animsys-aligorith/source/blender/render/intern/source/envmap.c
branches/animsys-aligorith/source/blender/render/intern/source/imagetexture.c
branches/animsys-aligorith/source/blender/render/intern/source/pipeline.c
branches/animsys-aligorith/source/blender/render/intern/source/rendercore.c
branches/animsys-aligorith/source/blender/render/intern/source/renderdatabase.c
branches/animsys-aligorith/source/blender/render/intern/source/shadbuf.c
branches/animsys-aligorith/source/blender/render/intern/source/shadeinput.c
branches/animsys-aligorith/source/blender/render/intern/source/shadeoutput.c
branches/animsys-aligorith/source/blender/render/intern/source/texture.c
branches/animsys-aligorith/source/blender/render/intern/source/zbuf.c
branches/animsys-aligorith/source/blender/src/buttons_editing.c
branches/animsys-aligorith/source/blender/src/buttons_object.c
branches/animsys-aligorith/source/blender/src/buttons_scene.c
branches/animsys-aligorith/source/blender/src/buttons_shading.c
branches/animsys-aligorith/source/blender/src/drawarmature.c
branches/animsys-aligorith/source/blender/src/drawipo.c
branches/animsys-aligorith/source/blender/src/drawnla.c
branches/animsys-aligorith/source/blender/src/drawnode.c
branches/animsys-aligorith/source/blender/src/drawobject.c
branches/animsys-aligorith/source/blender/src/drawtext.c
branches/animsys-aligorith/source/blender/src/drawview.c
branches/animsys-aligorith/source/blender/src/editaction.c
branches/animsys-aligorith/source/blender/src/editarmature.c
branches/animsys-aligorith/source/blender/src/editipo.c
branches/animsys-aligorith/source/blender/src/editipo_mods.c
branches/animsys-aligorith/source/blender/src/editmesh_mods.c
branches/animsys-aligorith/source/blender/src/editnla.c
branches/animsys-aligorith/source/blender/src/editobject.c
branches/animsys-aligorith/source/blender/src/editparticle.c
branches/animsys-aligorith/source/blender/src/editseq.c
branches/animsys-aligorith/source/blender/src/editview.c
branches/animsys-aligorith/source/blender/src/header_action.c
branches/animsys-aligorith/source/blender/src/header_nla.c
branches/animsys-aligorith/source/blender/src/header_node.c
branches/animsys-aligorith/source/blender/src/header_view3d.c
branches/animsys-aligorith/source/blender/src/interface.c
branches/animsys-aligorith/source/blender/src/meshlaplacian.c
branches/animsys-aligorith/source/blender/src/meshtools.c
branches/animsys-aligorith/source/blender/src/playanim.c
branches/animsys-aligorith/source/blender/src/poseobject.c
branches/animsys-aligorith/source/blender/src/renderwin.c
branches/animsys-aligorith/source/blender/src/sculptmode.c
branches/animsys-aligorith/source/blender/src/toets.c
branches/animsys-aligorith/source/blender/src/transform.c
branches/animsys-aligorith/source/blender/src/transform_conversions.c
branches/animsys-aligorith/source/blender/src/writeimage.c
branches/animsys-aligorith/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/animsys-aligorith/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/animsys-aligorith/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/animsys-aligorith/source/gameengine/Ketsji/BL_Shader.cpp
branches/animsys-aligorith/source/gameengine/Ketsji/BL_Texture.cpp
branches/animsys-aligorith/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/animsys-aligorith/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/animsys-aligorith/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/animsys-aligorith/source/nan_compile.mk
branches/animsys-aligorith/source/nan_definitions.mk
branches/animsys-aligorith/source/nan_link.mk
branches/animsys-aligorith/tools/Blender.py
Added Paths:
-----------
branches/animsys-aligorith/source/blender/render/intern/include/strand.h
branches/animsys-aligorith/source/blender/render/intern/source/strand.c
Modified: branches/animsys-aligorith/extern/bFTGL/include/FTGL.h
===================================================================
--- branches/animsys-aligorith/extern/bFTGL/include/FTGL.h 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/extern/bFTGL/include/FTGL.h 2007-12-09 23:05:47 UTC (rev 12832)
@@ -42,7 +42,11 @@
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>
- #include <GL/glu.h>
+ #if defined (__sun__) && !defined (__sparc__)
+ #include <mesa/glu.h>
+ #else
+ #include <GL/glu.h>
+ #endif
#endif
#endif
Modified: branches/animsys-aligorith/extern/bFTGL/src/Makefile
===================================================================
--- branches/animsys-aligorith/extern/bFTGL/src/Makefile 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/extern/bFTGL/src/Makefile 2007-12-09 23:05:47 UTC (rev 12832)
@@ -46,7 +46,8 @@
include nan_compile.mk
CPPFLAGS += -I../include
-CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2
+CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2
+CPPFLAGS += -I$(OPENGL_HEADERS)
install: all debug
@[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL)
Modified: branches/animsys-aligorith/intern/iksolver/intern/IK_QSegment.cpp
===================================================================
--- branches/animsys-aligorith/intern/iksolver/intern/IK_QSegment.cpp 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/intern/iksolver/intern/IK_QSegment.cpp 2007-12-09 23:05:47 UTC (rev 12832)
@@ -61,11 +61,11 @@
MT_Scalar t = sqrt(R[0][0]*R[0][0] + R[0][1]*R[0][1]);
if (t > 16.0*MT_EPSILON) {
- if (axis == 0) return atan2(R[1][2], R[2][2]);
+ if (axis == 0) return -atan2(R[1][2], R[2][2]);
else if(axis == 1) return atan2(-R[0][2], t);
- else return atan2(R[0][1], R[0][0]);
+ else return -atan2(R[0][1], R[0][0]);
} else {
- if (axis == 0) return atan2(-R[2][1], R[1][1]);
+ if (axis == 0) return -atan2(-R[2][1], R[1][1]);
else if(axis == 1) return atan2(-R[0][2], t);
else return 0.0f;
}
Modified: branches/animsys-aligorith/projectfiles_vc7/blender/render/BRE_render.vcproj
===================================================================
--- branches/animsys-aligorith/projectfiles_vc7/blender/render/BRE_render.vcproj 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/projectfiles_vc7/blender/render/BRE_render.vcproj 2007-12-09 23:05:47 UTC (rev 12832)
@@ -170,6 +170,9 @@
RelativePath="..\..\..\source\blender\render\intern\source\sss.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\source\strand.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\source\texture.c">
</File>
<File
@@ -234,6 +237,9 @@
RelativePath="..\..\..\source\blender\render\intern\include\sss.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\include\strand.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\include\texture.h">
</File>
<File
Modified: branches/animsys-aligorith/release/Makefile
===================================================================
--- branches/animsys-aligorith/release/Makefile 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/release/Makefile 2007-12-09 23:05:47 UTC (rev 12832)
@@ -44,7 +44,7 @@
EXT1=".zip"
COMPRESS=""
EXT2=""
- NOPLUGINS="true"
+ NOPLUGINS?=true
endif
ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris"))
@@ -55,6 +55,11 @@
COMPRESS="bzip2"
COMPRESSFLAGS="-f"
EXT2=".bz2"
+ ifeq ($(OS), solaris)
+ ifeq ($(CPU), i386)
+ NOPLUGINS?=true
+ endif
+ endif
endif
ifeq ($(OS),windows)
@@ -62,8 +67,8 @@
TARFLAGS="-r9"
EXT0=".exe"
EXT1=".zip"
- NOPLUGINS="true"
- NOSTRIP="true"
+ NOPLUGINS?=true
+ NOSTRIP?=true
endif
ifeq ($(OS),darwin)
Modified: branches/animsys-aligorith/release/scripts/ply_export.py
===================================================================
--- branches/animsys-aligorith/release/scripts/ply_export.py 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/release/scripts/ply_export.py 2007-12-09 23:05:47 UTC (rev 12832)
@@ -7,6 +7,7 @@
Tooltip: 'Export active object to Stanford PLY format'
"""
+import bpy
import Blender
from Blender import Mesh, Scene, Window, sys, Image, Draw
import BPyMesh
@@ -64,7 +65,7 @@
if not filename.lower().endswith('.ply'):
filename += '.ply'
- scn= Blender.Scene.GetCurrent()
+ scn= bpy.data.scenes.active
ob= scn.objects.active
if not ob:
Blender.Draw.PupMenu('Error%t|Select 1 active object')
@@ -89,6 +90,10 @@
if not Draw.PupBlock('Export...', pup_block):
return
+ is_editmode = Blender.Window.EditMode()
+ if is_editmode:
+ Blender.Window.EditMode(0, '', 0)
+
Window.WaitCursor(1)
EXPORT_APPLY_MODIFIERS = EXPORT_APPLY_MODIFIERS.val
@@ -132,7 +137,7 @@
if vertexColors: col = f.col
for j, v in enumerate(f):
if smooth:
- normal= v.no
+ normal= tuple(v.no)
normal_key = rvec3d(normal)
if faceUV:
@@ -211,12 +216,12 @@
file.write('\n')
file.close()
+
+ if is_editmode:
+ Blender.Window.EditMode(1, '', 0)
-
-
def main():
Blender.Window.FileSelector(file_callback, 'PLY Export', Blender.sys.makename(ext='.ply'))
-
if __name__=='__main__':
main()
Modified: branches/animsys-aligorith/release/scripts/wizard_curve2tree.py
===================================================================
--- branches/animsys-aligorith/release/scripts/wizard_curve2tree.py 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/release/scripts/wizard_curve2tree.py 2007-12-09 23:05:47 UTC (rev 12832)
@@ -1416,7 +1416,18 @@
- def toMesh(self, mesh=None, do_uv=True, do_uv_keep_vproportion=True, do_uv_vnormalize=False, do_uv_uscale=False, uv_image = None, uv_x_scale=1.0, uv_y_scale=4.0, do_uv_blend_layer= False, do_cap_ends=False):
+ def toMesh(self, mesh=None,\
+ do_uv=True,\
+ do_uv_keep_vproportion=True,\
+ do_uv_vnormalize=False,\
+ do_uv_uscale=False,\
+ uv_image = None,\
+ uv_x_scale=1.0,\
+ uv_y_scale=4.0,\
+ do_uv_blend_layer= False,\
+ do_cap_ends=False,\
+ ):
+
self.mesh = freshMesh(mesh)
totverts = 0
@@ -1678,12 +1689,8 @@
uv.y *= vscale
-
# Done with UV mapping the first layer! now map the blend layers
if do_uv_blend_layer:
-
-
-
# Set up the blend UV layer - this is simply the blending for branch joints
mesh.addUVLayer( 'blend' )
mesh.activeUVLayer = 'blend'
@@ -3009,15 +3016,15 @@
new_brch.calcData()
return new_brch
-
+ '''
def toMesh(self):
pass
+ '''
-
# No GUI code above this! ------------------------------------------------------
# PREFS - These can be saved on the object's id property. use 'tree2curve' slot
@@ -3337,7 +3344,7 @@
ob_mesh.setMatrix(Matrix())
# Do we need a do_uv_blend_layer?
- if PREFS['material_stencil'].val and PREFS['material_texture'].val:
+ if PREFS['do_material'].val and PREFS['material_stencil'].val and PREFS['material_texture'].val:
do_uv_blend_layer = True
else:
do_uv_blend_layer = False
@@ -3854,7 +3861,7 @@
xtmp = x
PREFS['material_texture'] = Draw.Toggle('Texture', EVENT_UPDATE_AND_UI, xtmp, y, but_width*2, but_height, PREFS['material_texture'].val, 'Create an image texture for this material to use'); xtmp += but_width*2;
- PREFS['material_stencil'] = Draw.Toggle('Blend Joints', EVENT_UPDATE, xtmp, y, but_width*2, but_height, PREFS['material_stencil'].val, 'Use a second texture and UV layer to blend joints'); xtmp += but_width*2;
+ PREFS['material_stencil'] = Draw.Toggle('Blend Joints', EVENT_UPDATE, xtmp, y, but_width*2, but_height, PREFS['material_stencil'].val, 'Use a 2 more texture and UV layers to blend the seams between joints'); xtmp += but_width*2;
Blender.Draw.EndAlign()
y-=but_height+MARGIN
Modified: branches/animsys-aligorith/source/Makefile
===================================================================
--- branches/animsys-aligorith/source/Makefile 2007-12-09 22:12:01 UTC (rev 12831)
+++ branches/animsys-aligorith/source/Makefile 2007-12-09 23:05:47 UTC (rev 12832)
@@ -61,7 +61,6 @@
############# set pyplayerlib ##################
-PYPLAYERLIB ?= $(PYLIB)
############# libraries ##################
# COMLIB COMmon LIBraries for all targets
@@ -175,54 +174,25 @@
endif
ifeq ($(WITH_FREETYPE2), true)
+ COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
ifeq ($(OS), windows)
ifeq ($(FREE_WINDOWS), true)
+ COMLIB += $(NAN_FTGL)/lib/libftgl.a
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
else
+ COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
endif
else
+ COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifeq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
- else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+ else
+ COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif
endif
endif
-ifeq ($(INTERNATIONAL), true)
- COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
- ifeq ($(OS), windows)
- ifeq ($(FREE_WINDOWS), true)
- COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
- COMLIB += $(NAN_FTGL)/lib/libftgl.a
- #COMLIB += $(NAN_ICONV)/lib/freeiconv.a
- else
- COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
- COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
- COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
- COMLIB += $(NAN_ICONV)/lib/iconv.lib
- endif
- else
- COMLIB += $(NAN_FTGL)/lib/libftgl.a
- ifeq ($(OS), irix)
- COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a
- COMLIB += $(NAN_FREETYPE)/lib32/libintl.a
- else
- COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
- endif
- endif
- ifeq ($(OS), darwin)
- COMLIB += $(NAN_GETTEXT)/lib/libintl.a
- ifeq ($(CPU), i386)
- COMLIB += $(NAN_GETTEXT)/lib/libiconv.a
- endif
- endif
- ifeq ($(OS), solaris)
- COMLIB += $(NAN_GETTEXT)/lib/libintl.a
- endif
-endif
-
ifeq ($(WITH_VERSE), true)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list