Revision: 14845
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14845
Author: jaguarandi
Date: 2008-05-14 22:01:22 +0200 (Wed, 14 May 2008)
Log Message:
-----------
Merge from trunk
svn merge -r 14760:14843
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_System.cpp
branches/soc-2008-jaguarandi/release/Makefile
branches/soc-2008-jaguarandi/release/scripts/3ds_export.py
branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
branches/soc-2008-jaguarandi/release/scripts/blenderLipSynchro.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/BPyAddMesh.py
branches/soc-2008-jaguarandi/release/scripts/export_m3g.py
branches/soc-2008-jaguarandi/release/scripts/hotkeys.py
branches/soc-2008-jaguarandi/release/scripts/import_dxf.py
branches/soc-2008-jaguarandi/release/scripts/object_apply_def.py
branches/soc-2008-jaguarandi/release/scripts/paths_import.py
branches/soc-2008-jaguarandi/release/scripts/render_save_layers.py
branches/soc-2008-jaguarandi/release/scripts/rvk1_torvk2.py
branches/soc-2008-jaguarandi/release/scripts/uvcalc_lightmap.py
branches/soc-2008-jaguarandi/release/scripts/vrml97_export.py
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_mball.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/image.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/mball.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/object.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/scene.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-jaguarandi/source/blender/blenlib/BLI_edgehash.h
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/arithb.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/edgehash.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/readfile.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2008-jaguarandi/source/blender/include/BIF_drawseq.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_editmesh.h
branches/soc-2008-jaguarandi/source/blender/include/BSE_drawview.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-jaguarandi/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-jaguarandi/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Blender.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Object.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Particle.h
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/API_intro.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Image.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Object.py
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2008-jaguarandi/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/pipeline.c
branches/soc-2008-jaguarandi/source/blender/render/intern/source/rayshade.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_editing.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_shading.c
branches/soc-2008-jaguarandi/source/blender/src/drawaction.c
branches/soc-2008-jaguarandi/source/blender/src/drawarmature.c
branches/soc-2008-jaguarandi/source/blender/src/drawimage.c
branches/soc-2008-jaguarandi/source/blender/src/drawobject.c
branches/soc-2008-jaguarandi/source/blender/src/drawseq.c
branches/soc-2008-jaguarandi/source/blender/src/drawview.c
branches/soc-2008-jaguarandi/source/blender/src/edit.c
branches/soc-2008-jaguarandi/source/blender/src/editaction.c
branches/soc-2008-jaguarandi/source/blender/src/editarmature.c
branches/soc-2008-jaguarandi/source/blender/src/editdeform.c
branches/soc-2008-jaguarandi/source/blender/src/editface.c
branches/soc-2008-jaguarandi/source/blender/src/editipo.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_lib.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_mods.c
branches/soc-2008-jaguarandi/source/blender/src/editmesh_tools.c
branches/soc-2008-jaguarandi/source/blender/src/editsima.c
branches/soc-2008-jaguarandi/source/blender/src/editview.c
branches/soc-2008-jaguarandi/source/blender/src/header_image.c
branches/soc-2008-jaguarandi/source/blender/src/header_ipo.c
branches/soc-2008-jaguarandi/source/blender/src/header_nla.c
branches/soc-2008-jaguarandi/source/blender/src/header_seq.c
branches/soc-2008-jaguarandi/source/blender/src/header_view3d.c
branches/soc-2008-jaguarandi/source/blender/src/interface_icons.c
branches/soc-2008-jaguarandi/source/blender/src/renderwin.c
branches/soc-2008-jaguarandi/source/blender/src/space.c
branches/soc-2008-jaguarandi/source/blender/src/splash.jpg.c
branches/soc-2008-jaguarandi/source/blender/src/toets.c
branches/soc-2008-jaguarandi/source/blender/src/transform.c
branches/soc-2008-jaguarandi/source/blender/src/transform_constraints.c
branches/soc-2008-jaguarandi/source/blender/src/transform_conversions.c
branches/soc-2008-jaguarandi/source/blender/src/transform_generics.c
branches/soc-2008-jaguarandi/source/blender/src/transform_manipulator.c
branches/soc-2008-jaguarandi/source/blender/src/transform_orientations.c
branches/soc-2008-jaguarandi/source/blender/src/usiblender.c
branches/soc-2008-jaguarandi/source/blender/src/view.c
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/GameLogic.py
Added Paths:
-----------
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/doc/Particle.py
Modified: branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_NDOFManager.cpp
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_NDOFManager.cpp
2008-05-14 20:01:22 UTC (rev 14845)
@@ -73,7 +73,9 @@
if (ndofLibraryInit && ndofDeviceOpen)
{
Pid= ndofLibraryInit();
+#if 0
printf("%i client \n", Pid);
+#endif
#if defined(_WIN32) || defined(__APPLE__)
m_DeviceHandle = ndofDeviceOpen((void
*)¤tNdofValues);
#else
Modified: branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_System.cpp
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/intern/ghost/intern/GHOST_System.cpp
2008-05-14 20:01:22 UTC (rev 14845)
@@ -283,9 +283,11 @@
m_eventManager = new GHOST_EventManager ();
m_ndofManager = new GHOST_NDOFManager();
+#if 0
if(m_ndofManager)
printf("ndof manager \n");
-
+#endif
+
#ifdef GHOST_DEBUG
if (m_eventManager) {
m_eventManager->addConsumer(&m_eventPrinter);
Modified: branches/soc-2008-jaguarandi/release/Makefile
===================================================================
--- branches/soc-2008-jaguarandi/release/Makefile 2008-05-14 19:29:33 UTC
(rev 14844)
+++ branches/soc-2008-jaguarandi/release/Makefile 2008-05-14 20:01:22 UTC
(rev 14845)
@@ -118,7 +118,6 @@
ifneq ($(OS), darwin)
@[ ! -d $(OCGDIR)/bin/.blender ] || \
cp -r $(OCGDIR)/bin/.blender $(DISTDIR)
- @rm -rf $(DISTDIR)/.svn $(DISTDIR)/*/.svn $(DISTDIR)/*/*/.svn
@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR)
@cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR)
endif
@@ -144,8 +143,7 @@
@cp ../source/blender/blenpluginapi/*.h $(DISTDIR)/plugins/include/
@chmod 755 $(DISTDIR)/plugins/bmake
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
- @rm -fr $(DISTDIR)/plugins/.svn $(DISTDIR)/plugins/*/.svn \
- $(DISTDIR)/plugins/*/*.o
+ @rm -f $(DISTDIR)/plugins/*/*.o
#on OS X the plugins move to the installation directory
ifneq ($(OS),darwin)
@@ -158,7 +156,6 @@
@echo "----> Copy python infrastructure"
@[ ! -d scripts ] || cp -r scripts $(CONFDIR)/scripts
- @[ ! -d $(CONFDIR)/scripts ] || rm -fr $(CONFDIR)/scripts/.svn
$(CONFDIR)/scripts/*/.svn $(CONFDIR)/scripts/*/*/.svn
ifeq ($(OS),darwin)
@echo "----> Move .blender to .app/Contents/MacOS/"
@@ -180,6 +177,8 @@
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
cd $(CONFIG_GUESS) && ./specific.sh )
+ @echo "----> Cleaning .svn metadata directories"
+ @find $(DISTDIR) -type d -name ".svn" | xargs rm -fr
pkg: install
@echo "----> Create distribution file $(BLENDNAME)$(EXT1)"
Modified: branches/soc-2008-jaguarandi/release/scripts/3ds_export.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/3ds_export.py 2008-05-14
19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/3ds_export.py 2008-05-14
20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: '3D Studio (.3ds)...'
Blender: 243
Modified: branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/bevel_center.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus
Name: 'Bevel Center'
Blender: 243
Modified: branches/soc-2008-jaguarandi/release/scripts/blenderLipSynchro.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/blenderLipSynchro.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/blenderLipSynchro.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'BlenderLipSynchro'
Blender: 242
Modified: branches/soc-2008-jaguarandi/release/scripts/bpymodules/BPyAddMesh.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/bpymodules/BPyAddMesh.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/bpymodules/BPyAddMesh.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -68,11 +68,7 @@
else:
# Mesh with no data, unlikely
me.edges.extend(edges)
- me.faces.extend(faces)
-
- if is_editmode or Blender.Get('add_editmode'):
- EditMode(1)
-
+ me.faces.extend(faces)
else:
# Object mode add new
@@ -95,11 +91,15 @@
ob_act.setMatrix(mat)
ob_act.loc = cursor
+
+ if is_editmode or Blender.Get('add_editmode'):
+ EditMode(1)
+ else: # adding in object mode means we need to calc normals
+ me.calcNormals()
+
+
- if is_editmode or Blender.Get('add_editmode'):
- EditMode(1)
-
def write_mesh_script(filepath, me):
'''
filepath - path to py file
@@ -112,7 +112,7 @@
file.write('#!BPY\n')
file.write('"""\n')
file.write('Name: \'%s\'\n' % name)
- file.write('Blender: 243\n')
+ file.write('Blender: 245\n')
file.write('Group: \'AddMesh\'\n')
file.write('"""\n\n')
file.write('import BPyAddMesh\n')
Modified: branches/soc-2008-jaguarandi/release/scripts/export_m3g.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/export_m3g.py 2008-05-14
19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/export_m3g.py 2008-05-14
20:01:22 UTC (rev 14845)
@@ -1,4 +1,5 @@
#!BPY
+# coding: utf-8
""" Registration info for Blender menus:
Name: 'M3G (.m3g, .java)...'
Blender: 244
@@ -3069,4 +3070,5 @@
Window.RedrawAll()
if __name__ == '__main__':
- gui()
\ No newline at end of file
+ gui()
+
Modified: branches/soc-2008-jaguarandi/release/scripts/hotkeys.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/hotkeys.py 2008-05-14
19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/hotkeys.py 2008-05-14
20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
""" Registration info for Blender menus:
Name: 'HotKey and MouseAction Reference'
Blender: 242
@@ -918,4 +918,4 @@
Blender.Window.Redraw()
if __name__ == '__main__':
- Register(draw, event, bevent)
\ No newline at end of file
+ Register(draw, event, bevent)
Modified: branches/soc-2008-jaguarandi/release/scripts/import_dxf.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/import_dxf.py 2008-05-14
19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/import_dxf.py 2008-05-14
20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'Autodesk DXF (.dxf)'
Blender: 244
@@ -5942,4 +5942,5 @@
main(_dxf)
print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME)
-"""
\ No newline at end of file
+"""
+
Modified: branches/soc-2008-jaguarandi/release/scripts/object_apply_def.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/object_apply_def.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/object_apply_def.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -77,7 +77,11 @@
for vgroupname in vgroups:
target_me.addVertGroup(vgroupname)
if len(target_me.verts) == len(source_me.verts):
- vlist = source_me.getVertsFromGroup(vgroupname,
True)
+ try: # in rare cases this can raise an 'no
deform groups assigned to mesh' error
+ vlist =
source_me.getVertsFromGroup(vgroupname, True)
+ except:
+ vlist = []
+
try:
for vpair in vlist:
target_me.assignVertsToGroup(vgroupname, [vpair[0]], vpair[1], ADD)
@@ -171,4 +175,4 @@
Blender.Window.RedrawAll()
if __name__=='__main__':
- apply_deform()
\ No newline at end of file
+ apply_deform()
Modified: branches/soc-2008-jaguarandi/release/scripts/paths_import.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/paths_import.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/paths_import.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -1,5 +1,5 @@
#!BPY
-
+# coding: utf-8
"""
Name: 'Paths (.svg, .ps, .eps, .ai, Gimp)'
Blender: 233
@@ -92,4 +92,5 @@
fonctionSELECT = functionSELECT # can they all be called function?
text = 'Import %s' % argv
-Blender.Window.FileSelector (fonctionSELECT, text)
\ No newline at end of file
+Blender.Window.FileSelector (fonctionSELECT, text)
+
Modified: branches/soc-2008-jaguarandi/release/scripts/render_save_layers.py
===================================================================
--- branches/soc-2008-jaguarandi/release/scripts/render_save_layers.py
2008-05-14 19:29:33 UTC (rev 14844)
+++ branches/soc-2008-jaguarandi/release/scripts/render_save_layers.py
2008-05-14 20:01:22 UTC (rev 14845)
@@ -47,9 +47,13 @@
# default filename: theme's name + '_theme.py' in user's scripts dir:
default_fname = Blender.Get("scriptsdir")
-default_fname = Blender.sys.join(default_fname, sce.name + '_renderlayer.py')
-default_fname = default_fname.replace(' ','_')
+if not default_fname:
+ default_fname = Blender.Get("uscriptsdir")
+if default_fname:
+ default_fname = Blender.sys.join(default_fname, sce.name +
'_renderlayer.py')
+ default_fname = default_fname.replace(' ','_')
+
def write_renderlayers(filename):
"Write the current renderlayer as a bpython script"
@@ -113,4 +117,4 @@
except:
Blender.Draw.PupMenu("Warning - check console!%t|Menus could
not be automatically updated")
-FileSelector(write_renderlayers, "Save RenderLayers", default_fname)
\ No newline at end of file
+FileSelector(write_renderlayers, "Save RenderLayers", default_fname)
Modified: branches/soc-2008-jaguarandi/release/scripts/rvk1_torvk2.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
