[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23728] trunk/lib/windows: * add opencollada win32 lib in preparation for gsoc branch merger later.
Revision: 23728 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23728 Author: jesterking Date: 2009-10-09 08:18:52 +0200 (Fri, 09 Oct 2009) Log Message: --- * add opencollada win32 lib in preparation for gsoc branch merger later. Added Paths: --- trunk/lib/windows/opencollada/ trunk/lib/windows/opencollada/include/ trunk/lib/windows/opencollada/include/COLLADABaseUtils/ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUException.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashFunctions.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUHashMap.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUIDList.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUNativeString.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPlatform.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUPrerequisites.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUStableHeaders.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUStringUtils.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUURI.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/COLLADABUUtils.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/ trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix3.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathMatrix4.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathPrerequisites.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathQuaternion.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathUtils.h trunk/lib/windows/opencollada/include/COLLADABaseUtils/include/Math/COLLADABUMathVector3.h trunk/lib/windows/opencollada/include/COLLADAFramework/ trunk/lib/windows/opencollada/include/COLLADAFramework/include/ trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimatable.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimatableFloat.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimation.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationCurve.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnimationList.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWAnnotate.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArray.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWArrayPrimitiveType.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCamera.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWCode.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWColor.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWColorOrTexture.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWConstants.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWController.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEdge.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEffect.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWEffectCommon.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWException.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWExtraData.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWExtraKeys.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFileInfo.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrDoubleArray.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWFloatOrParam.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWGeometry.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWILoader.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWIWriter.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWImage.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWImageSource.h trunk/lib/windows/opencollada/include/COLLADAFramework/include/COLLADAFWInclude.h trunk/lib/
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23727] trunk/blender/release/scripts/io/ netrender: netrender
Revision: 23727
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23727
Author: theeth
Date: 2009-10-09 03:52:57 +0200 (Fri, 09 Oct 2009)
Log Message:
---
netrender
Support for fluid files and better support for point cache (including external
cache for particles)
This also fixes a couple of bugs with frame based dependencies and with file
transfer.
NOTE: With external point cache and fluids, the path needs to be relative or
relative to the file (starting with //) if the files are not on a shared drive.
It should eventually warn if that is not the case, but doesn't right now, so be
careful.
Modified Paths:
--
trunk/blender/release/scripts/io/netrender/client.py
trunk/blender/release/scripts/io/netrender/model.py
trunk/blender/release/scripts/io/netrender/utils.py
Modified: trunk/blender/release/scripts/io/netrender/client.py
===
--- trunk/blender/release/scripts/io/netrender/client.py2009-10-09
01:34:46 UTC (rev 23726)
+++ trunk/blender/release/scripts/io/netrender/client.py2009-10-09
01:52:57 UTC (rev 23727)
@@ -8,6 +8,68 @@
import netrender.master as master
from netrender.utils import *
+def addFluidFiles(job, path):
+ if os.path.exists(path):
+ pattern =
re.compile("fluidsurface_(final|preview)_([0-9]+)\.(bobj|bvel)\.gz")
+
+ for fluid_file in sorted(os.listdir(path)):
+ match = pattern.match(fluid_file)
+
+ if match:
+ current_frame = int(match.groups()[1])
+ job.addFile(path + fluid_file, current_frame,
current_frame)
+
+def addPointCache(job, ob, point_cache, default_path):
+ if not point_cache.disk_cache:
+ return
+
+
+ name = point_cache.name
+ if name == "":
+ name = "".join(["%02X" % ord(c) for c in ob.name])
+
+ cache_path = bpy.sys.expandpath(point_cache.filepath) if
point_cache.external else default_path
+
+ index = "%02i" % point_cache.index
+
+ if os.path.exists(cache_path):
+ pattern = re.compile(name + "_([0-9]+)_" + index + "\.bphys")
+
+ cache_files = []
+
+ for cache_file in sorted(os.listdir(cache_path)):
+ match = pattern.match(cache_file)
+
+ if match:
+ cache_frame = int(match.groups()[0])
+ cache_files.append((cache_frame, cache_file))
+
+ cache_files.sort()
+
+ if len(cache_files) == 1:
+ cache_frame, cache_file = cache_files[0]
+ job.addFile(cache_path + cache_file, cache_frame,
cache_frame)
+ else:
+ for i in range(len(cache_files)):
+ current_item = cache_files[i]
+ next_item = cache_files[i+1] if i + 1 <
len(cache_files) else None
+ previous_item = cache_files[i - 1] if i > 0
else None
+
+ current_frame, current_file = current_item
+
+ if not next_item and not previous_item:
+ job.addFile(cache_path + current_file,
current_frame, current_frame)
+ elif next_item and not previous_item:
+ next_frame = next_item[0]
+ job.addFile(cache_path + current_file,
current_frame, next_frame - 1)
+ elif not next_item and previous_item:
+ previous_frame = previous_item[0]
+ job.addFile(cache_path + current_file,
previous_frame + 1, current_frame)
+ else:
+ next_frame = next_item[0]
+ previous_frame = previous_item[0]
+ job.addFile(cache_path + current_file,
previous_frame + 1, next_frame - 1)
+
def clientSendJob(conn, scene, anim = False):
netsettings = scene.network_render
job = netrender.model.RenderJob()
@@ -23,6 +85,7 @@
job_name = netsettings.job_name
path, name = os.path.split(filename)
+ path += os.sep
if job_name == "[default]":
job_name = name
@@ -30,68 +93,39 @@
# LIBRARIES
###
for lib in bpy.data.libraries:
- lib_path = li
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23726] trunk/blender/source/blender/ python/intern/bpy_rna.c: Partial revert of rev 23723
Revision: 23726
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23726
Author: theeth
Date: 2009-10-09 03:34:46 +0200 (Fri, 09 Oct 2009)
Log Message:
---
Partial revert of rev 23723
BRECHT, CHECK THIS
The change made it return RNA python properties with null data pointer instead
of None.
That would make the particles and physics properties crash like this:
1. A valid property instead of None makes is seem like smoke (or other)
modifier data is in context when it is Null.
2. UI code would try to access RNA properties of the (Null) modifier, which
would crash
Revision Links:
--
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23723
Modified Paths:
--
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===
--- trunk/blender/source/blender/python/intern/bpy_rna.c2009-10-08
19:32:06 UTC (rev 23725)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c2009-10-09
01:34:46 UTC (rev 23726)
@@ -433,7 +433,7 @@
{
PointerRNA newptr;
newptr= RNA_property_pointer_get(ptr, prop);
- if (newptr.type) {
+ if (newptr.data) {
ret = pyrna_struct_CreatePyObject(&newptr);
} else {
ret = Py_None;
@@ -1297,7 +1297,7 @@
CTX_data_get(self->ptr.data, name, &newptr, &newlb);
-if (newptr.type) {
+if (newptr.data) {
ret = pyrna_struct_CreatePyObject(&newptr);
}
else if (newlb.first) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23725] trunk/blender/tools/Blender.py: scons - ignore removing _tkinter.so when its not there
Revision: 23725
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23725
Author: campbellbarton
Date: 2009-10-08 21:32:06 +0200 (Thu, 08 Oct 2009)
Log Message:
---
scons - ignore removing _tkinter.so when its not there
Modified Paths:
--
trunk/blender/tools/Blender.py
Modified: trunk/blender/tools/Blender.py
===
--- trunk/blender/tools/Blender.py 2009-10-08 19:06:32 UTC (rev 23724)
+++ trunk/blender/tools/Blender.py 2009-10-08 19:32:06 UTC (rev 23725)
@@ -555,7 +555,7 @@
run('rm -rf "%s/site-packages"' % py_target)
run('mkdir "%s/site-packages"' % py_target)# python needs it.'
- run('rm "%s/lib-dynload/_tkinter.so"' % py_target)
+ run('rm -f "%s/lib-dynload/_tkinter.so"' % py_target)
run('find "%s" -name "test" -prune -exec rm -rf {} \;' % py_target)
run('find "%s" -name "*.py?" -exec rm -rf {} \;' % py_target)
run('find "%s" -name "*.so"-exec strip -s {} \;' % py_target)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23724] trunk/blender: menus are now global (like operators), so for eg, the info add menu and the 3D add menu can be shared.
Revision: 23724
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23724
Author: campbellbarton
Date: 2009-10-08 21:06:32 +0200 (Thu, 08 Oct 2009)
Log Message:
---
menus are now global (like operators), so for eg, the info add menu and the 3D
add menu can be shared.
Modified Paths:
--
trunk/blender/release/scripts/ui/space_buttons.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_outliner.py
trunk/blender/release/scripts/ui/space_sequencer.py
trunk/blender/release/scripts/ui/space_text.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/blenkernel/BKE_screen.h
trunk/blender/source/blender/blenkernel/intern/screen.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_intern.h
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/space_node/node_header.c
trunk/blender/source/blender/makesrna/intern/rna_ui.c
trunk/blender/source/blender/python/intern/bpy_operator.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blender/windowmanager/wm_window.h
Modified: trunk/blender/release/scripts/ui/space_buttons.py
===
--- trunk/blender/release/scripts/ui/space_buttons.py 2009-10-08 18:40:03 UTC
(rev 23723)
+++ trunk/blender/release/scripts/ui/space_buttons.py 2009-10-08 19:06:32 UTC
(rev 23724)
@@ -22,7 +22,6 @@
row.itemR(scene, "current_frame")
class Buttons_MT_view(bpy.types.Menu):
- __space_type__ = 'PROPERTIES'
__label__ = "View"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_console.py
===
--- trunk/blender/release/scripts/ui/space_console.py 2009-10-08 18:40:03 UTC
(rev 23723)
+++ trunk/blender/release/scripts/ui/space_console.py 2009-10-08 19:06:32 UTC
(rev 23724)
@@ -38,7 +38,6 @@
row.itemO("console.autocomplete", text="Autocomplete")
class CONSOLE_MT_console(bpy.types.Menu):
- __space_type__ = 'CONSOLE'
__label__ = "Console"
def draw(self, context):
@@ -51,7 +50,6 @@
layout.itemO("console.paste")
class CONSOLE_MT_report(bpy.types.Menu):
- __space_type__ = 'CONSOLE'
__label__ = "Report"
def draw(self, context):
Modified: trunk/blender/release/scripts/ui/space_image.py
===
--- trunk/blender/release/scripts/ui/space_image.py 2009-10-08 18:40:03 UTC
(rev 23723)
+++ trunk/blender/release/scripts/ui/space_image.py 2009-10-08 19:06:32 UTC
(rev 23724)
@@ -2,7 +2,6 @@
import bpy
class IMAGE_MT_view(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "View"
def draw(self, context):
@@ -44,7 +43,6 @@
layout.itemO("screen.screen_full_area")
class IMAGE_MT_select(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Select"
def draw(self, context):
@@ -65,7 +63,6 @@
layout.itemO("uv.select_linked")
class IMAGE_MT_image(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Image"
def draw(self, context):
@@ -109,7 +106,6 @@
layout.itemR(sima, "image_painting")
class IMAGE_MT_uvs_showhide(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Show/Hide Faces"
def draw(self, context):
@@ -120,7 +116,6 @@
layout.item_booleanO("uv.hide", "unselected", True)
class IMAGE_MT_uvs_transform(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Transform"
def draw(self, context):
@@ -131,7 +126,6 @@
layout.itemO("tfm.resize")
class IMAGE_MT_uvs_mirror(bpy.types.Menu):
- __space_type__ = 'IMAGE_EDITOR'
__label__ = "Mirror"
def draw(self, context):
@@ -145,7 +139,6
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23723] trunk/blender: Key Configuration
Revision: 23723 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23723 Author: blendix Date: 2009-10-08 20:40:03 +0200 (Thu, 08 Oct 2009) Log Message: --- Key Configuration Keymaps are now saveable and configurable from the user preferences, note that editing one item in a keymap means the whole keymap is now defined by the user and will not be updated by Blender, an option for syncing might be added later. The outliner interface is still there, but I will probably remove it. There's actually 3 levels now: * Default builtin key configuration. * Key configuration loaded from .py file, for configs like Blender 2.4x or other 3D applications. * Keymaps edited by the user and saved in .B.blend. These can be saved to .py files as well to make creating distributable configurations easier. Also, user preferences sections were reorganized a bit, now there is: Interface, Editing, Input, Files and System. Implementation notes: * wmKeyConfig was added which represents a key configuration containing keymaps. * wmKeymapItem was renamed to wmKeyMapItem for consistency with wmKeyMap. * Modal maps are not wrapped yet. * User preferences DNA file reading did not support newdataadr() yet, added this now for reading keymaps. * Key configuration related settings are now RNA wrapped. * is_property_set and is_property_hidden python methods were added. Modified Paths: -- trunk/blender/release/scripts/ui/space_userpref.py trunk/blender/source/blender/blenkernel/BKE_screen.h trunk/blender/source/blender/blenkernel/intern/blender.c trunk/blender/source/blender/blenloader/intern/readfile.c trunk/blender/source/blender/blenloader/intern/writefile.c trunk/blender/source/blender/editors/animation/anim_channels_edit.c trunk/blender/source/blender/editors/animation/anim_markers.c trunk/blender/source/blender/editors/animation/anim_ops.c trunk/blender/source/blender/editors/armature/armature_ops.c trunk/blender/source/blender/editors/curve/curve_ops.c trunk/blender/source/blender/editors/gpencil/gpencil_ops.c trunk/blender/source/blender/editors/include/ED_anim_api.h trunk/blender/source/blender/editors/include/ED_armature.h trunk/blender/source/blender/editors/include/ED_curve.h trunk/blender/source/blender/editors/include/ED_gpencil.h trunk/blender/source/blender/editors/include/ED_markers.h trunk/blender/source/blender/editors/include/ED_mball.h trunk/blender/source/blender/editors/include/ED_mesh.h trunk/blender/source/blender/editors/include/ED_object.h trunk/blender/source/blender/editors/include/ED_particle.h trunk/blender/source/blender/editors/include/ED_physics.h trunk/blender/source/blender/editors/include/ED_screen.h trunk/blender/source/blender/editors/include/ED_sculpt.h trunk/blender/source/blender/editors/include/ED_transform.h trunk/blender/source/blender/editors/include/ED_uvedit.h trunk/blender/source/blender/editors/include/UI_interface.h trunk/blender/source/blender/editors/include/UI_view2d.h trunk/blender/source/blender/editors/interface/interface.c trunk/blender/source/blender/editors/interface/interface_handlers.c trunk/blender/source/blender/editors/interface/interface_layout.c trunk/blender/source/blender/editors/interface/interface_utils.c trunk/blender/source/blender/editors/interface/view2d_ops.c trunk/blender/source/blender/editors/mesh/editmesh_mods.c trunk/blender/source/blender/editors/mesh/mesh_ops.c trunk/blender/source/blender/editors/metaball/mball_ops.c trunk/blender/source/blender/editors/object/object_ops.c trunk/blender/source/blender/editors/physics/physics_ops.c trunk/blender/source/blender/editors/screen/area.c trunk/blender/source/blender/editors/screen/screen_ops.c trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c trunk/blender/source/blender/editors/space_action/action_intern.h trunk/blender/source/blender/editors/space_action/action_ops.c trunk/blender/source/blender/editors/space_action/space_action.c trunk/blender/source/blender/editors/space_api/spacetypes.c trunk/blender/source/blender/editors/space_buttons/space_buttons.c trunk/blender/source/blender/editors/space_console/space_console.c trunk/blender/source/blender/editors/space_file/file_panels.c trunk/blender/source/blender/editors/space_file/filelist.c trunk/blender/source/blender/editors/space_file/filesel.c trunk/blender/source/blender/editors/space_file/space_file.c trunk/blender/source/blender/editors/space_graph/graph_intern.h trunk/blender/source/blender/editors/space_graph/graph_ops.c trunk/blender/source/blender/editors/space_graph/space_graph.c trunk/blender/source/blender/editors/space_image/space_image.c trunk/blender/source/blender/editors/space_info/space_info.c trunk/blender/source/blender/edit
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23722] trunk/blender/release/scripts: Scripts
Revision: 23722
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23722
Author: khughes
Date: 2009-10-08 19:32:51 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Scripts
---
Port of MDD export script to Blender 2.5.
Modified Paths:
--
trunk/blender/release/scripts/ui/space_info.py
Added Paths:
---
trunk/blender/release/scripts/io/export_mdd.py
Copied: trunk/blender/release/scripts/io/export_mdd.py (from rev 23617,
branches/blender2.4/release/scripts/export_mdd.py)
===
--- trunk/blender/release/scripts/io/export_mdd.py
(rev 0)
+++ trunk/blender/release/scripts/io/export_mdd.py 2009-10-08 17:32:51 UTC
(rev 23722)
@@ -0,0 +1,188 @@
+#!BPY
+
+"""
+ Name: 'Vertex Keyframe Animation (.mdd)...'
+ Blender: 242
+ Group: 'Export'
+ Tooltip: 'Animated mesh to MDD vertex keyframe file.'
+"""
+
+__author__ = "Bill L.Nieuwendorp"
+__bpydoc__ = """\
+This script Exports Lightwaves MotionDesigner format.
+
+The .mdd format has become quite a popular Pipeline format
+for moving animations from package to package.
+
+Be sure not to use modifiers that change the number or order of verts in the
mesh
+"""
+#Please send any fixes,updates,bugs to Slow67_at_Gmail.com or
cbarton_at_metavr.com
+#Bill Niewuendorp
+# * 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 bpy
+import Mathutils
+import math
+import os
+
+#import Blender
+#from Blender import *
+#import BPyMessages
+try:
+ from struct import pack
+except:
+ pack = None
+
+def zero_file(filepath):
+ '''
+ If a file fails, this replaces it with 1 char, better not remove it?
+ '''
+ file = open(filepath, 'w')
+ file.write('\n') # apparently macosx needs some data in a blank file?
+ file.close()
+
+def check_vertcount(mesh,vertcount):
+ '''
+ check and make sure the vertcount is consistent throughout the frame
range
+ '''
+ if len(mesh.verts) != vertcount:
+ raise Exception('Error, number of verts has changed during
animation, cannot export')
+ f.close()
+ zero_file(filepath)
+ return
+
+
+def write(filename, sce, ob, PREF_STARTFRAME, PREF_ENDFRAME, PREF_FPS):
+ if not pack:
+ raise Exception('Error, this script requires the "pack" module')
+
+ if ob.type != 'MESH':
+ raise Exception('Error, active object is not a mesh')
+ """
+ Window.EditMode(0)
+ Blender.Window.WaitCursor(1)
+
+ mesh_orig = Mesh.New()
+ mesh_orig.getFromObject(ob.name)
+ """
+ orig_frame = sce.current_frame
+ sce.set_frame(PREF_STARTFRAME)
+ me = ob.create_mesh(True, 'PREVIEW')
+
+ #Flip y and z
+ mat_flip= Mathutils.Matrix(\
+ [1.0, 0.0, 0.0, 0.0],\
+ [0.0, 0.0, 1.0, 0.0],\
+ [0.0, 1.0, 0.0, 0.0],\
+ [0.0, 0.0, 0.0, 1.0],\
+ )
+
+ numverts = len(me.verts)
+
+ numframes = PREF_ENDFRAME-PREF_STARTFRAME+1
+ PREF_FPS= float(PREF_FPS)
+ f = open(filename, 'wb') #no Errors yet:Safe to create file
+
+ # Write the header
+ f.write(pack(">2i", numframes, numverts))
+
+ # Write the frame times (should we use the time IPO??)
+ f.write( pack(">%df" % (numframes), *[frame/PREF_FPS for frame in
range(numframes)]) ) # seconds
+
+ #rest frame needed to keep frames in sync
+ """
+ Blender.Set('curframe', PREF_STARTFRAME)
+ me_tmp.getFromObject(ob.name)
+ """
+
+ check_vertcount(me,numverts)
+ me.transform(mat_flip * ob.matrix)
+ 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
+ """
+ Blender.Set('curframe', frame)
+ me_tmp.getFromObject(ob.name)
+ """
+
+ sce.set_frame(frame)
+ me = ob.create_mesh(True, 'PREVIEW')
+ check_vertcount(me,numverts)
+
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23721] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Cocoa port :
Revision: 23721
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23721
Author: damien78
Date: 2009-10-08 19:13:57 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Cocoa port :
Quick&dirty bug fix to catch ad discard tablet induced exceptions.
I'll make a clean fix upon getting a tablet to debug.
Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-08
15:50:42 UTC (rev 23720)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-08
17:13:57 UTC (rev 23721)
@@ -1098,7 +1098,8 @@
NSUInteger tabletEvent;
//Handle tablet events combined with mouse events
- switch ([event subtype]) {
+ @try {
+ switch ([event subtype]) {
case NX_SUBTYPE_TABLET_POINT:
tabletEvent = NSTabletPoint;
break;
@@ -1109,8 +1110,14 @@
default:
tabletEvent = [event type];
break;
+ }
}
+ @catch (NSException * e) {
+ //FIXME: check why we get such exceptions when using a tablet
+ return GHOST_kFailure;
+ }
+
switch (tabletEvent) {
case NSTabletPoint:
ct.Pressure = [event tangentialPressure];
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23720] trunk/blender/source/blender/ editors: bring back automerge - [#19538] automerge editing doesn't work
Revision: 23720
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23720
Author: campbellbarton
Date: 2009-10-08 17:50:42 +0200 (Thu, 08 Oct 2009)
Log Message:
---
bring back automerge - [#19538] automerge editing doesn't work
Modified Paths:
--
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/mesh_intern.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-10-08
15:29:43 UTC (rev 23719)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2009-10-08
15:50:42 UTC (rev 23720)
@@ -117,22 +117,26 @@
}
}
-void EM_automerge(int update)
+void EM_automerge(Scene *scene, Object *obedit, int update)
{
-// XXX int len;
-
-// if ((scene->automerge) &&
-// (obedit && obedit->type==OB_MESH) &&
-// (((Mesh*)obedit->data)->mr==NULL)
-// ) {
-// len = removedoublesflag(1, 1, scene->toolsettings->doublimit);
-// if (len) {
-// em->totvert -= len; /* saves doing a countall */
-// if (update) {
-// DAG_id_flush_update(obedit->data,
OB_RECALC_DATA);
-// }
-// }
-// }
+ Mesh *me= (Mesh*)obedit->data; /* can be NULL */
+ int len;
+
+ if ((scene->toolsettings->automerge) &&
+ (obedit && obedit->type==OB_MESH && obedit->mode==OB_MODE_EDIT)
&&
+ (me->mr==NULL)
+ ) {
+ Mesh *me= (Mesh*)obedit->data;
+ EditMesh *em= me->edit_mesh;
+
+ len = removedoublesflag(em, 1, 1,
scene->toolsettings->doublimit);
+ if (len) {
+ em->totvert -= len; /* saves doing a countall */
+ if (update) {
+ DAG_id_flush_update(obedit->data,
OB_RECALC_DATA);
+ }
+ }
+ }
}
/* ** SELECTION ROUTINES */
Modified: trunk/blender/source/blender/editors/mesh/mesh_intern.h
===
--- trunk/blender/source/blender/editors/mesh/mesh_intern.h 2009-10-08
15:29:43 UTC (rev 23719)
+++ trunk/blender/source/blender/editors/mesh/mesh_intern.h 2009-10-08
15:50:42 UTC (rev 23720)
@@ -167,7 +167,7 @@
void MESH_OT_flip_normals(struct wmOperatorType *ot);
extern EditEdge *findnearestedge(ViewContext *vc, int *dist);
-extern void EM_automerge(int update);
+extern void EM_automerge(Scene *scene, Object *obedit, int update);
void editmesh_select_by_material(EditMesh *em, int index);
void righthandfaces(EditMesh *em, int select); /* makes faces righthand
turning */
void EM_select_more(EditMesh *em);
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-10-08 15:29:43 UTC (rev 23719)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2009-10-08 15:50:42 UTC (rev 23720)
@@ -4477,8 +4477,8 @@
if (t->spacetype==SPACE_VIEW3D) {
if (t->obedit) {
if (cancelled==0) {
+ EM_automerge(t->scene, t->obedit, 1);
#if 0 // TRANSFORM_FIX_ME
- EM_automerge(1);
/* when snapping, delay retopo until after
automerge */
if (G.qual & LR_CTRLKEY) {
retopo_do_all();
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23719] trunk/blender/source/blender: toggle buttons for texture channels (hardcoded like UV layer buttons)
Revision: 23719
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23719
Author: campbellbarton
Date: 2009-10-08 17:29:43 +0200 (Thu, 08 Oct 2009)
Log Message:
---
toggle buttons for texture channels (hardcoded like UV layer buttons)
Modified Paths:
--
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/makesrna/intern/rna_material.c
Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===
--- trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-08 15:28:31 UTC (rev 23718)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c
2009-10-08 15:29:43 UTC (rev 23719)
@@ -2070,6 +2070,10 @@
uiDefIconButR(block, TOG, 0,
ICON_SCENE, 0, 0, UI_UNIT_X, UI_UNIT_Y, &itemptr, "active_render", 0, 0, 0, 0,
0, NULL);
uiBlockSetEmboss(block,
UI_EMBOSS);
}
+ else if (itemptr.type ==
&RNA_MaterialTextureSlot) {
+ uiDefButR(block, OPTION, 0, "",
0, 0, UI_UNIT_X, UI_UNIT_Y, ptr, "use_textures", i, 0, 0, 0, 0, NULL);
+ }
+ /* XXX - end hardcoded cruft */
if(name)
MEM_freeN(name);
Modified: trunk/blender/source/blender/makesrna/intern/rna_material.c
===
--- trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-08
15:28:31 UTC (rev 23718)
+++ trunk/blender/source/blender/makesrna/intern/rna_material.c 2009-10-08
15:29:43 UTC (rev 23719)
@@ -1730,6 +1730,13 @@
rna_def_mtex_common(srna, "rna_Material_mtex_begin",
"rna_Material_active_texture_get",
"rna_Material_active_texture_set", "MaterialTextureSlot",
"rna_Material_update");
+ /* only material has this one */
+ prop= RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_negative_sdna(prop, NULL, "septex", 1);
+ RNA_def_property_array(prop, 18);
+ RNA_def_property_ui_text(prop, "Use Textures", "Enable/Disable each
texture.");
+ RNA_def_property_update(prop, 0, "rna_Material_update");
+
rna_def_material_colors(srna);
rna_def_material_diffuse(srna);
rna_def_material_specularity(srna);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23718] trunk/blender/intern/ghost/intern: Cocoa port :
Revision: 23718
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23718
Author: damien78
Date: 2009-10-08 17:28:31 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Cocoa port :
Bug fix : newly created window not seen as activated by WM
Added more conservative memory management (may need to optimize later)
Modified Paths:
--
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-08
15:19:57 UTC (rev 23717)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-08
15:28:31 UTC (rev 23718)
@@ -806,7 +806,10 @@
GHOST_ASSERT(m_windowManager, "m_windowManager not initialized");
m_windowManager->addWindow(window);
m_windowManager->setActiveWindow(window);
-pushEvent(new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowSize, window));
+ //Need to tell window manager the new window is the
active one (Cocoa does not send the event activate upon window creation)
+pushEvent(new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowActivate, window));
+ pushEvent(new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowSize, window));
+
}
else {
GHOST_PRINT("GHOST_SystemCocoa::createWindow(): window
invalid\n");
@@ -1156,7 +1159,6 @@
GHOST_IWindow* window = m_windowManager->getActiveWindow();
if (!window) {
- printf("\nM invalid window");
return GHOST_kFailure;
}
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2009-10-08
15:19:57 UTC (rev 23717)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm 2009-10-08
15:28:31 UTC (rev 23718)
@@ -319,7 +319,7 @@
/*if(ugly_hack==m_windowRef) ugly_hack= NULL;
if(ugly_hack==NULL)
setDrawingContextType(GHOST_kDrawingContextTypeNone);*/
-
+NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[m_openGLView release];
if (m_window) {
@@ -327,6 +327,7 @@
[m_window release];
m_window = nil;
}
+ [pool drain];
}
#pragma mark accessors
@@ -566,7 +567,9 @@
{
if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
if (m_openGLContext != nil) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]
init];
[m_openGLContext flushBuffer];
+ [pool drain];
return GHOST_kSuccess;
}
}
@@ -577,7 +580,9 @@
{
if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
if (m_openGLContext != nil) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]
init];
[m_openGLContext update];
+ [pool drain];
return GHOST_kSuccess;
}
}
@@ -588,6 +593,8 @@
{
if (m_drawingContextType == GHOST_kDrawingContextTypeOpenGL) {
if (m_openGLContext != nil) {
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]
init];
+
[m_openGLContext makeCurrentContext];
#ifdef GHOST_DRAW_CARBON_GUTTER
// Restrict drawing to non-gutter area
@@ -603,6 +610,7 @@
};
GLboolean result = ::aglSetInteger(m_aglCtx,
AGL_BUFFER_RECT, b);
#endif //GHOST_DRAW_CARBON_GUTTER
+ [pool drain];
return GHOST_kSuccess;
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23717] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke:
Revision: 23717
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23717
Author: genscher
Date: 2009-10-08 17:19:57 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Smoke:
* Bugfix for non initialized arrays (reported by nudelZ)
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/smoke.c
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-10-08
15:02:01 UTC (rev 23716)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-10-08
15:19:57 UTC (rev 23717)
@@ -964,8 +964,7 @@
for(z = 0; z < sds->res[2]; z++)
{
EffectedPoint epoint;
- float voxelCenter[3], vel[3], retvel[3];
-
+ float voxelCenter[3] = {0,0,0} , vel[3] =
{0,0,0} , retvel[3] = {0,0,0};
unsigned int index = smoke_get_index(x,
sds->res[0], y, sds->res[1], z);
if(density[index] < FLT_EPSILON)
@@ -983,9 +982,9 @@
pdDoEffectors(effectors, NULL,
sds->effector_weights, &epoint, retvel, NULL);
// TODO dg - do in force!
- force_x[index] += MIN2(MAX2(-1.0, retvel[0] *
0.002), 1.0);
- force_y[index] += MIN2(MAX2(-1.0, retvel[1] *
0.002), 1.0);
- force_z[index] += MIN2(MAX2(-1.0, retvel[2] *
0.002), 1.0);
+ force_x[index] = MIN2(MAX2(-1.0, retvel[0] *
0.2), 1.0);
+ force_y[index] = MIN2(MAX2(-1.0, retvel[1] *
0.2), 1.0);
+ force_z[index] = MIN2(MAX2(-1.0, retvel[2] *
0.2), 1.0);
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23716] trunk/blender/release/scripts/io/ netrender/master.py: netrender: bugfix by matd on irc.
Revision: 23716 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23716 Author: theeth Date: 2009-10-08 17:02:01 +0200 (Thu, 08 Oct 2009) Log Message: --- netrender: bugfix by matd on irc. unbound var when broadcast is off Modified Paths: -- trunk/blender/release/scripts/io/netrender/master.py Modified: trunk/blender/release/scripts/io/netrender/master.py === --- trunk/blender/release/scripts/io/netrender/master.py2009-10-08 14:11:06 UTC (rev 23715) +++ trunk/blender/release/scripts/io/netrender/master.py2009-10-08 15:02:01 UTC (rev 23716) @@ -744,7 +744,7 @@ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) - start_time = time.time() + start_time = time.time() while not test_break(): httpd.handle_request() ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23715] trunk/blender/source/blender/ editors/interface/resources.c: unselected group color was too hard to see in the 3D view, made darker
Revision: 23715
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23715
Author: campbellbarton
Date: 2009-10-08 16:11:06 +0200 (Thu, 08 Oct 2009)
Log Message:
---
unselected group color was too hard to see in the 3D view, made darker
Modified Paths:
--
trunk/blender/source/blender/editors/interface/resources.c
Modified: trunk/blender/source/blender/editors/interface/resources.c
===
--- trunk/blender/source/blender/editors/interface/resources.c 2009-10-08
12:33:51 UTC (rev 23714)
+++ trunk/blender/source/blender/editors/interface/resources.c 2009-10-08
14:11:06 UTC (rev 23715)
@@ -456,7 +456,7 @@
SETCOL(btheme->tv3d.lamp, 0, 0, 0, 40);
SETCOL(btheme->tv3d.select, 241, 88, 0, 255);
SETCOL(btheme->tv3d.active, 255, 140, 25, 255);
- SETCOL(btheme->tv3d.group, 16, 64, 16, 255);
+ SETCOL(btheme->tv3d.group, 8, 48, 8, 255);
SETCOL(btheme->tv3d.group_active, 85, 187, 85, 255);
SETCOL(btheme->tv3d.transform, 0xff, 0xff, 0xff, 255);
SETCOL(btheme->tv3d.vertex, 0, 0, 0, 255);
@@ -1018,7 +1018,7 @@
}
/* Group theme colors */
if(btheme->tv3d.group[3]==0) {
- SETCOL(btheme->tv3d.group, 0x10, 0x40, 0x10,
255);
+ SETCOL(btheme->tv3d.group, 0x0C, 0x30, 0x0C,
255);
SETCOL(btheme->tv3d.group_active, 0x66, 0xFF,
0x66, 255);
}
/* Sequence editor theme*/
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23714] trunk/blender/source/blender/ editors/screen/screen_ops.c: Alt+A in the sequencer now redraws other sequencer views, not ideal but ok for now.
Revision: 23714
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23714
Author: campbellbarton
Date: 2009-10-08 14:33:51 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Alt+A in the sequencer now redraws other sequencer views, not ideal but ok for
now.
Modified Paths:
--
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===
--- trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-08
12:13:23 UTC (rev 23713)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c2009-10-08
12:33:51 UTC (rev 23714)
@@ -2347,7 +2347,14 @@
ED_screen_animation_timer_update(C, stime->redraws);
}
else {
- ED_screen_animation_timer(C,
TIME_REGION|TIME_ALL_3D_WIN, sync, mode);
+ int redraws = TIME_REGION|TIME_ALL_3D_WIN;
+
+ /* XXX - would like a better way to deal with this
situation - Campbell */
+ if((sa) && (sa->spacetype == SPACE_SEQ)) {
+ redraws |= TIME_SEQ;
+ }
+
+ ED_screen_animation_timer(C, redraws, sync, mode);
if(screen->animtimer) {
wmTimer *wt= screen->animtimer;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23713] trunk/blender/projectfiles_vc9/ blender/render/BRE_raytrace.vcproj: 2.5 MSVC projectfiles_vc9
Revision: 23713 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23713 Author: elubie Date: 2009-10-08 14:13:23 +0200 (Thu, 08 Oct 2009) Log Message: --- 2.5 MSVC projectfiles_vc9 eek, forgot to add file in last commit Added Paths: --- trunk/blender/projectfiles_vc9/blender/render/BRE_raytrace.vcproj Added: trunk/blender/projectfiles_vc9/blender/render/BRE_raytrace.vcproj === --- trunk/blender/projectfiles_vc9/blender/render/BRE_raytrace.vcproj (rev 0) +++ trunk/blender/projectfiles_vc9/blender/render/BRE_raytrace.vcproj 2009-10-08 12:13:23 UTC (rev 23713) @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: trunk/blender/projectfiles_vc9/blender/render/BRE_raytrace.vcproj ___ Name: svn:eol-style + CRLF ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23712] trunk/blender: A few fixes:
Revision: 23712
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23712
Author: aligorith
Date: 2009-10-08 13:29:27 +0200 (Thu, 08 Oct 2009)
Log Message:
---
A few fixes:
* Loading old files didn't initialise the new rotation variables properly
* Fixed some errors with the newly added operator for copying RNA-paths for
properties
* Auto-keyframing now correctly refreshes animation editors after adding
keyframes. Made the keyingsets code send notifiers again, but now using the
newly added WM_main_event_add() (thanks Brecht)
* A few UI tweaks again for animation stuff (timeline, keyingsets UI)
Modified Paths:
--
trunk/blender/release/scripts/ui/buttons_object.py
trunk/blender/release/scripts/ui/buttons_scene.py
trunk/blender/release/scripts/ui/space_time.py
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
Modified: trunk/blender/release/scripts/ui/buttons_object.py
===
--- trunk/blender/release/scripts/ui/buttons_object.py 2009-10-08 11:24:06 UTC
(rev 23711)
+++ trunk/blender/release/scripts/ui/buttons_object.py 2009-10-08 11:29:27 UTC
(rev 23712)
@@ -26,8 +26,6 @@
ob = context.object
-
-
row = layout.row()
row.column().itemR(ob, "location")
Modified: trunk/blender/release/scripts/ui/buttons_scene.py
===
--- trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-08 11:24:06 UTC
(rev 23711)
+++ trunk/blender/release/scripts/ui/buttons_scene.py 2009-10-08 11:29:27 UTC
(rev 23712)
@@ -474,7 +474,7 @@
scene = context.scene
row = layout.row()
- row.itemL(text="Keying Sets")
+ row.itemL(text="Keying Sets:")
row = layout.row()
@@ -512,7 +512,7 @@
ks = scene.active_keying_set
row = layout.row()
- row.itemL(text="Paths")
+ row.itemL(text="Paths:")
row = layout.row()
Modified: trunk/blender/release/scripts/ui/space_time.py
===
--- trunk/blender/release/scripts/ui/space_time.py 2009-10-08 11:24:06 UTC
(rev 23711)
+++ trunk/blender/release/scripts/ui/space_time.py 2009-10-08 11:29:27 UTC
(rev 23712)
@@ -100,7 +100,7 @@
layout.itemS()
sub = layout.row()
- sub.active = tools.enable_auto_key
+ #sub.active = tools.enable_auto_key
sub.itemM("TIME_MT_autokey")
class TIME_MT_playback(bpy.types.Menu):
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-08
11:24:06 UTC (rev 23711)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2009-10-08
11:29:27 UTC (rev 23712)
@@ -9912,6 +9912,24 @@
/* put 2.50 compatibility code here until next subversion bump */
{
+ Object *ob;
+
+ /* New variables for axis-angle rotations and/or quaternion
rotations were added, and need proper initialisation */
+ for (ob= main->object.first; ob; ob= ob->id.next) {
+ /* new variables for all objects */
+ ob->quat[0]= 1.0f;
+ ob->rotAxis[1]= 1.0f;
+
+ /* bones */
+ if (ob->pose) {
+ bPoseChannel *pchan;
+
+ for (pchan= ob->pose->chanbase.first; pchan;
pchan= pchan->next) {
+ /* just need to initalise rotation axis
properly... */
+ pchan->rotAxis[1]= 1.0f;
+ }
+ }
+ }
}
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
Modified: trunk/blender/source/blender/editors/animation/drivers.c
===
--- trunk/blender/source/blender/editors/animation/drivers.c2009-10-08
11:24:06 UTC (rev 23711)
+++ trunk/blender/source/blender/editors/animation/drivers.c
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23711] trunk/blender/source/blender/ render: Fixed #19571
Revision: 23711
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23711
Author: jaguarandi
Date: 2009-10-08 13:24:06 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Fixed #19571
(was crashing when building a raytree from a scene withouth any geometry)
Modified Paths:
--
trunk/blender/source/blender/render/extern/include/RE_raytrace.h
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/render/intern/source/rayshade.c
Modified: trunk/blender/source/blender/render/extern/include/RE_raytrace.h
===
--- trunk/blender/source/blender/render/extern/include/RE_raytrace.h
2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/extern/include/RE_raytrace.h
2009-10-08 11:24:06 UTC (rev 23711)
@@ -83,6 +83,7 @@
/* RayObject constructors */
RayObject* RE_rayobject_octree_create(int ocres, int size);
RayObject* RE_rayobject_instance_create(RayObject *target, float
transform[][4], void *ob, void *target_ob);
+RayObject* RE_rayobject_empty_create();
RayObject* RE_rayobject_blibvh_create(int size); /* BLI_kdopbvh.c */
RayObject* RE_rayobject_vbvh_create(int size); /*
raytrace/rayobject_vbvh.c */
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
===
--- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
2009-10-08 11:24:06 UTC (rev 23711)
@@ -535,3 +535,43 @@
return 0;
}
+
+
+/*
+ * Empty raytree
+ */
+static int RE_rayobject_empty_intersect(RayObject *o, Isect *is)
+{
+ return 0;
+}
+
+static void RE_rayobject_empty_free(RayObject *o)
+{
+}
+
+static void RE_rayobject_empty_bb(RayObject *o, float *min, float *max)
+{
+ return;
+}
+
+static float RE_rayobject_empty_cost(RayObject *o)
+{
+ return 0.0;
+}
+
+static RayObjectAPI empty_api =
+{
+ RE_rayobject_empty_intersect,
+ NULL, //static void RE_rayobject_instance_add(RayObject *o, RayObject
*ob);
+ NULL, //static void RE_rayobject_instance_done(RayObject *o);
+ RE_rayobject_empty_free,
+ RE_rayobject_empty_bb,
+ RE_rayobject_empty_cost
+};
+
+static RayObject empty_raytree = { &empty_api, {0, 0} };
+
+RayObject *RE_rayobject_empty_create()
+{
+ return RE_rayobject_unalignRayAPI( &empty_raytree );
+}
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===
--- trunk/blender/source/blender/render/intern/source/rayshade.c
2009-10-08 11:12:03 UTC (rev 23710)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c
2009-10-08 11:24:06 UTC (rev 23711)
@@ -335,6 +335,12 @@
}
}
+ if(faces + special == 0)
+ {
+ re->raytree = RE_rayobject_empty_create();
+ return;
+ }
+
//Create raytree
raytree = re->raytree = RE_rayobject_create( re,
re->r.raytrace_structure, faces+special );
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23710] trunk/blender/projectfiles_vc9/ blender: 2.5 MSVC9 projectfiles
Revision: 23710
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23710
Author: elubie
Date: 2009-10-08 13:12:03 +0200 (Thu, 08 Oct 2009)
Log Message:
---
2.5 MSVC9 projectfiles
Quick update:
* added new raytrace lib
* added gpu_buffer.c
Modified Paths:
--
trunk/blender/projectfiles_vc9/blender/blender.sln
trunk/blender/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
trunk/blender/projectfiles_vc9/blender/render/BRE_render.vcproj
Modified: trunk/blender/projectfiles_vc9/blender/blender.sln
===
--- trunk/blender/projectfiles_vc9/blender/blender.sln 2009-10-08 10:18:14 UTC
(rev 23709)
+++ trunk/blender/projectfiles_vc9/blender/blender.sln 2009-10-08 11:12:03 UTC
(rev 23710)
@@ -13,6 +13,7 @@
{884D8731-654C-4C7F-9A75-8F37A305BE1E} =
{884D8731-654C-4C7F-9A75-8F37A305BE1E}
{79D0B232-208C-F208-DA71-79B4AC088602} =
{79D0B232-208C-F208-DA71-79B4AC088602}
{E645CC32-4823-463E-82F0-46ADDE664018} =
{E645CC32-4823-463E-82F0-46ADDE664018}
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1} =
{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284} =
{7495FE37-933A-4AC1-BB2A-B3FDB4DE4284}
{51FB3D48-2467-4BFA-A321-D848252B437E} =
{51FB3D48-2467-4BFA-A321-D848252B437E}
{FFD3C64A-30E2-4BC7-BC8F-51818C320400} =
{FFD3C64A-30E2-4BC7-BC8F-51818C320400}
@@ -61,6 +62,7 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BKE_blenkernel",
"blenkernel\BKE_blenkernel.vcproj", "{CAE37E91-6570-43AC-A4B4-7A37A4B0FC94}"
ProjectSection(ProjectDependencies) = postProject
{02110D03-59DB-4571-8787-72B3C03B2F2D} =
{02110D03-59DB-4571-8787-72B3C03B2F2D}
+ {138DD16C-CC78-4F6C-A898-C8DA68D89067} =
{138DD16C-CC78-4F6C-A898-C8DA68D89067}
{9C71A793-C177-4CAB-8EC5-923D500B39F8} =
{9C71A793-C177-4CAB-8EC5-923D500B39F8}
EndProjectSection
EndProject
@@ -231,9 +233,9 @@
{79D0B232-208C-F208-DA71-79B4AC088602} =
{79D0B232-208C-F208-DA71-79B4AC088602}
{FFD3C64A-30E2-4BC7-BC8F-51818C320400} =
{FFD3C64A-30E2-4BC7-BC8F-51818C320400}
{EADC3C5A-6C51-4F03-8038-1553E7D7F740} =
{EADC3C5A-6C51-4F03-8038-1553E7D7F740}
- {BAC615B0-F1AF-418B-8D23-A10FD8870D6A} =
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
{8BFA4082-773B-D100-BC24-659083BA023F} =
{8BFA4082-773B-D100-BC24-659083BA023F}
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} =
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
+ {BAC615B0-F1AF-418B-8D23-A10FD8870D6A} =
{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INT_boolop",
"..\..\intern\boolop\make\msvc_9_0\boolop.vcproj",
"{EB75F4D6-2970-4A3A-8D99-2BAD7201C0E9}"
@@ -328,6 +330,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EXT_lzo",
"..\..\extern\lzo\make\msvc_9_0\lzo.vcproj",
"{8BFA4082-773B-D100-BC24-659083BA023F}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BRE_raytrace",
"render\BRE_raytrace.vcproj", "{37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3D Plugin Debug|Win32 = 3D Plugin Debug|Win32
@@ -1545,6 +1549,26 @@
{8BFA4082-773B-D100-BC24-659083BA023F}.Debug|Win32.Build.0 = 3D
Plugin Debug|Win32
{8BFA4082-773B-D100-BC24-659083BA023F}.Release|Win32.ActiveCfg
= 3D Plugin Release|Win32
{8BFA4082-773B-D100-BC24-659083BA023F}.Release|Win32.Build.0 =
3D Plugin Release|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3D Plugin
Debug|Win32.ActiveCfg = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3D Plugin
Debug|Win32.Build.0 = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3D Plugin
Release|Win32.ActiveCfg = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3D Plugin
Release|Win32.Build.0 = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3DPlugin
Debug|Win32.ActiveCfg = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3DPlugin
Debug|Win32.Build.0 = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3DPlugin
Release|Win32.ActiveCfg = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.3DPlugin
Release|Win32.Build.0 = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Blender
Debug|Win32.ActiveCfg = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Blender
Debug|Win32.Build.0 = Blender Debug|Win32
+ {37DB6A34-2E91-4ADB-BC1A-02F6D0A5E2F1}.Blender
Release|Win32.ActiveCfg = Blender Release
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23709] trunk/blender: Smoke:
Revision: 23709
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23709
Author: genscher
Date: 2009-10-08 12:18:14 +0200 (Thu, 08 Oct 2009)
Log Message:
---
Smoke:
* Enable external forces like e.g. wind
Modified Paths:
--
trunk/blender/intern/smoke/extern/smoke_API.h
trunk/blender/intern/smoke/intern/FLUID_3D.cpp
trunk/blender/intern/smoke/intern/smoke_API.cpp
trunk/blender/release/scripts/ui/buttons_physics_smoke.py
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/makesdna/DNA_smoke_types.h
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: trunk/blender/intern/smoke/extern/smoke_API.h
===
--- trunk/blender/intern/smoke/extern/smoke_API.h 2009-10-08 09:22:39 UTC
(rev 23708)
+++ trunk/blender/intern/smoke/extern/smoke_API.h 2009-10-08 10:18:14 UTC
(rev 23709)
@@ -50,6 +50,10 @@
float *smoke_get_velocity_y(struct FLUID_3D *fluid);
float *smoke_get_velocity_z(struct FLUID_3D *fluid);
+float *smoke_get_force_x(struct FLUID_3D *fluid);
+float *smoke_get_force_y(struct FLUID_3D *fluid);
+float *smoke_get_force_z(struct FLUID_3D *fluid);
+
unsigned char *smoke_get_obstacle(struct FLUID_3D *fluid);
size_t smoke_get_index(int x, int max_x, int y, int max_y, int z);
Modified: trunk/blender/intern/smoke/intern/FLUID_3D.cpp
===
--- trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2009-10-08 09:22:39 UTC
(rev 23708)
+++ trunk/blender/intern/smoke/intern/FLUID_3D.cpp 2009-10-08 10:18:14 UTC
(rev 23709)
@@ -184,13 +184,6 @@
{
// addSmokeTestCase(_density, _res);
// addSmokeTestCase(_heat, _res);
-
- // wipe forces
- for (int i = 0; i < _totalCells; i++)
- {
- _xForce[i] = _yForce[i] = _zForce[i] = 0.0f;
- // _obstacles[i] &= ~2;
- }
wipeBoundaries();
@@ -232,6 +225,13 @@
// todo xxx dg: only clear obstacles, not boundaries
// memset(_obstacles, 0, sizeof(unsigned char)*_xRes*_yRes*_zRes);
+
+ // wipe forces
+ // for external forces we can't do it at the beginning of this function
but at the end
+ for (int i = 0; i < _totalCells; i++)
+ {
+ _xForce[i] = _yForce[i] = _zForce[i] = 0.0f;
+ }
}
//
Modified: trunk/blender/intern/smoke/intern/smoke_API.cpp
===
--- trunk/blender/intern/smoke/intern/smoke_API.cpp 2009-10-08 09:22:39 UTC
(rev 23708)
+++ trunk/blender/intern/smoke/intern/smoke_API.cpp 2009-10-08 10:18:14 UTC
(rev 23709)
@@ -235,6 +235,21 @@
return fluid->_zVelocity;
}
+extern "C" float *smoke_get_force_x(FLUID_3D *fluid)
+{
+ return fluid->_xForce;
+}
+
+extern "C" float *smoke_get_force_y(FLUID_3D *fluid)
+{
+ return fluid->_yForce;
+}
+
+extern "C" float *smoke_get_force_z(FLUID_3D *fluid)
+{
+ return fluid->_zForce;
+}
+
extern "C" float *smoke_turbulence_get_density(WTURBULENCE *wt)
{
return wt ? wt->getDensityBig() : NULL;
Modified: trunk/blender/release/scripts/ui/buttons_physics_smoke.py
===
--- trunk/blender/release/scripts/ui/buttons_physics_smoke.py 2009-10-08
09:22:39 UTC (rev 23708)
+++ trunk/blender/release/scripts/ui/buttons_physics_smoke.py 2009-10-08
10:18:14 UTC (rev 23709)
@@ -1,7 +1,8 @@
import bpy
-from buttons_particle import point_cache_ui
+from buttons_physics_common import point_cache_ui
+from buttons_physics_common import effector_weights_ui
class PhysicButtonsPanel(bpy.types.Panel):
__space_type__ = 'PROPERTIES'
@@ -171,8 +172,20 @@
cache = md.point_cache_high
point_cache_ui(self, cache, cache.baked==False, 0, 1)
+
+class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel):
+ __label__ = "Smoke Field Weights"
+ __default_closed__ = True
+
+ def poll(self, context):
+ return (context.smoke)
+
+ def draw(self, context):
+ domain = context.smoke.domain_settings
+ effector_weights_ui(self, domain.effector_weights)
bpy.types.register(PHYSICS_PT_smoke)
+bpy.types.register(PHYSICS_PT_smoke_field_weights)
bpy.types.register(PHYSICS_PT_smoke_cache)
bpy.types.register(PHYSICS_PT_smoke_highres)
bpy.types.register(PHYSICS_PT_smoke_groups)
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
=
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23708] trunk/blender/source/blender: separate material lost all materials for the new mesh
Revision: 23708
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23708
Author: campbellbarton
Date: 2009-10-08 11:22:39 +0200 (Thu, 08 Oct 2009)
Log Message:
---
separate material lost all materials for the new mesh
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_material.h
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/mesh/editmesh.c
Modified: trunk/blender/source/blender/blenkernel/BKE_material.h
===
--- trunk/blender/source/blender/blenkernel/BKE_material.h 2009-10-08
08:01:51 UTC (rev 23707)
+++ trunk/blender/source/blender/blenkernel/BKE_material.h 2009-10-08
09:22:39 UTC (rev 23708)
@@ -62,8 +62,8 @@
int find_material_index(struct Object *ob, struct Material *ma);
-void object_add_material_slot(struct Object *ob);
-void object_remove_material_slot(struct Object *ob);
+int object_add_material_slot(struct Object *ob);
+int object_remove_material_slot(struct Object *ob);
/* rendering */
Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===
--- trunk/blender/source/blender/blenkernel/intern/material.c 2009-10-08
08:01:51 UTC (rev 23707)
+++ trunk/blender/source/blender/blenkernel/intern/material.c 2009-10-08
09:22:39 UTC (rev 23708)
@@ -630,8 +630,7 @@
{
int i, actcol_orig= ob->actcol;
- while(ob->totcol)
- object_remove_material_slot(ob);
+ while(object_remove_material_slot(ob)) {};
/* now we have the right number of slots */
for(i=0; itotcol>=MAXMAT) return;
+ if(ob==0) return FALSE;
+ if(ob->totcol>=MAXMAT) return FALSE;
ma= give_current_material(ob, ob->actcol);
assign_material(ob, ma, ob->totcol+1);
ob->actcol= ob->totcol;
+ return TRUE;
}
static void do_init_render_material(Material *ma, int r_mode, float *amb)
@@ -889,7 +889,7 @@
}
-void object_remove_material_slot(Object *ob)
+int object_remove_material_slot(Object *ob)
{
Material *mao, ***matarar;
Object *obt;
@@ -898,7 +898,7 @@
short *totcolp;
int a, actcol;
- if(ob==NULL || ob->totcol==0) return;
+ if(ob==NULL || ob->totcol==0) return FALSE;
/* take a mesh/curve/mball as starting point, remove 1 index,
* AND with all objects that share the ob->data
@@ -909,6 +909,8 @@
totcolp= give_totcolp(ob);
matarar= give_matarar(ob);
+ if(*matarar==NULL) return FALSE;
+
/* we delete the actcol */
if(ob->totcol) {
mao= (*matarar)[ob->actcol-1];
@@ -971,6 +973,8 @@
}
freedisplist(&ob->disp);
}
+
+ return TRUE;
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===
--- trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-08
08:01:51 UTC (rev 23707)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2009-10-08
09:22:39 UTC (rev 23708)
@@ -1233,6 +1233,7 @@
if(ob->totcol) {
obn->mat= MEM_dupallocN(ob->mat);
obn->matbits= MEM_dupallocN(ob->matbits);
+ obn->totcol= ob->totcol;
}
if(ob->bb) obn->bb= MEM_dupallocN(ob->bb);
Modified: trunk/blender/source/blender/editors/mesh/editmesh.c
===
--- trunk/blender/source/blender/editors/mesh/editmesh.c2009-10-08
08:01:51 UTC (rev 23707)
+++ trunk/blender/source/blender/editors/mesh/editmesh.c2009-10-08
09:22:39 UTC (rev 23708)
@@ -1343,6 +1343,7 @@
/* 2 */
basenew->object->data= menew= add_mesh(me->id.name);/* empty */
+ assign_matarar(basenew->object, give_matarar(obedit),
*give_totcolp(obedit)); /* new in 2.5 */
me->id.us--;
make_editMesh(scene, basenew->object);
emnew= menew->edit_mesh;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23707] trunk/blender/release/scripts/ui/ space_view3d.py: missed this in last commit comments,
Revision: 23707
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23707
Author: campbellbarton
Date: 2009-10-08 10:01:51 +0200 (Thu, 08 Oct 2009)
Log Message:
---
missed this in last commit comments,
Pattern Select operator, access from the object select menu
Glob strings like "Lear*.brown" and "Tree.0?", option for case sensitive and
extend the existing selection.
currently the default string is "*" which needs to be edited in the redo-panel
in the toolbox since there is no way to get a text input for python.
This replaces 2.4x's data browser Shift+F4, pattern select.
Modified Paths:
--
trunk/blender/release/scripts/ui/space_view3d.py
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===
--- trunk/blender/release/scripts/ui/space_view3d.py2009-10-08 07:54:20 UTC
(rev 23706)
+++ trunk/blender/release/scripts/ui/space_view3d.py2009-10-08 08:01:51 UTC
(rev 23707)
@@ -1319,6 +1319,7 @@
__props__ = [
bpy.props.StringProperty(attr="pattern", name="Pattern",
description="Name filter using '*' and '?' wildcard chars", maxlen= 32,
default= "*"),
bpy.props.BoolProperty(attr="case_sensitive", name="Case
Sensitive", description="Do a case sensitive compare", default= False),
+ bpy.props.BoolProperty(attr="extend", name="Extend",
description="Extend the existing selection", default= True),
]
def execute(self, context):
@@ -1330,6 +1331,8 @@
for ob in context.visible_objects:
if pattern_match(ob.name, self.pattern):
ob.selected = True
+ elif not self.extend:
+ ob.selected = False
return ('FINISHED',)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23706] trunk/blender: - object. selected is now editable (uses update function to flag the scene base)
Revision: 23706
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23706
Author: campbellbarton
Date: 2009-10-08 09:54:20 +0200 (Thu, 08 Oct 2009)
Log Message:
---
- object.selected is now editable (uses update function to flag the scene base)
- editing properties from python wasnt running their update function.
- missing commas made dir(context) give joined strings.
- added __undo__ as an operator class attribute so python ops can be set as
undoable. (like existing __register__)
Modified Paths:
--
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/screen/screen_context.c
trunk/blender/source/blender/editors/space_view3d/space_view3d.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===
--- trunk/blender/release/scripts/ui/space_view3d.py2009-10-08 07:04:42 UTC
(rev 23705)
+++ trunk/blender/release/scripts/ui/space_view3d.py2009-10-08 07:54:20 UTC
(rev 23706)
@@ -179,6 +179,7 @@
layout.itemO("object.select_by_layer", text="Select All by
Layer")
layout.item_enumO("object.select_by_type", "type", "",
text="Select All by Type...")
layout.itemO("object.select_grouped", text="Select Grouped...")
+ layout.itemO("object.select_pattern", text="Select Pattern...")
class VIEW3D_MT_select_pose(bpy.types.Menu):
__space_type__ = 'VIEW_3D'
@@ -1306,7 +1307,42 @@
col.itemO("TFM_OT_select_orientation", text="Select")
col.itemO("TFM_OT_create_orientation", text="Create")
col.itemO("TFM_OT_delete_orientation", text="Delete")
-
+
+# Operators
+
+class OBJECT_OT_select_pattern(bpy.types.Operator):
+ '''Select object matching a naming pattern.'''
+ __idname__ = "object.select_pattern"
+ __label__ = "Select Pattern"
+ __register__ = True
+ __undo__ = True
+ __props__ = [
+ bpy.props.StringProperty(attr="pattern", name="Pattern",
description="Name filter using '*' and '?' wildcard chars", maxlen= 32,
default= "*"),
+ bpy.props.BoolProperty(attr="case_sensitive", name="Case
Sensitive", description="Do a case sensitive compare", default= False),
+ ]
+
+ def execute(self, context):
+
+ import fnmatch
+ if self.case_sensitive: pattern_match = fnmatch.fnmatchcase
+ else: pattern_match = lambda
a, b: fnmatch.fnmatchcase(a.upper(), b.upper())
+
+ for ob in context.visible_objects:
+ if pattern_match(ob.name, self.pattern):
+ ob.selected = True
+
+ return ('FINISHED',)
+
+ # TODO - python cant do popups yet
+ '''
+ def invoke(self, context, event):
+ wm = context.manager
+ wm.add_fileselect(self.__operator__)
+ return ('RUNNING_MODAL',)
+ '''
+
+
+
bpy.types.register(VIEW3D_HT_header) # Header
bpy.types.register(VIEW3D_MT_view) #View Menus
@@ -1382,4 +1418,7 @@
bpy.types.register(VIEW3D_PT_3dview_meshdisplay)
bpy.types.register(VIEW3D_PT_3dview_curvedisplay)
bpy.types.register(VIEW3D_PT_background_image)
-bpy.types.register(VIEW3D_PT_transform_orientations)
\ No newline at end of file
+bpy.types.register(VIEW3D_PT_transform_orientations)
+
+bpy.ops.add(OBJECT_OT_select_pattern)
+
Modified: trunk/blender/source/blender/editors/screen/screen_context.c
===
--- trunk/blender/source/blender/editors/screen/screen_context.c
2009-10-08 07:04:42 UTC (rev 23705)
+++ trunk/blender/source/blender/editors/screen/screen_context.c
2009-10-08 07:54:20 UTC (rev 23706)
@@ -52,7 +52,7 @@
if(CTX_data_dir(member)) {
static const char *dir[] = {
"scene", "selected_objects", "selected_bases",
- "selected_editable_objects", "selected_editable_bases"
+ "selected_editable_objects", "selected_editable_bases",
"active_base", "active_object", "edit_object",
"sculpt_object", "vertex_paint_object",
"weight_paint_object",
"texture_paint_object", "brush",
"particle_edit_object", NULL};
Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c
2009-10-08 07:04:42 UTC (rev 23705)
+++ trunk/ble
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23705] branches/soc-2008-mxcurioni/ release/scripts/freestyle/data/models/: removing 3ds files in release/ scripts/freestyle
Revision: 23705 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23705 Author: mxcurioni Date: 2009-10-08 09:04:42 +0200 (Thu, 08 Oct 2009) Log Message: --- removing 3ds files in release/scripts/freestyle Removed Paths: - branches/soc-2008-mxcurioni/release/scripts/freestyle/data/models/ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
