[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30673] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30563 :30668
Nicholas Bishop
nicholasbishop at gmail.com
Fri Jul 23 22:07:00 CEST 2010
Revision: 30673
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30673
Author: nicholasbishop
Date: 2010-07-23 22:06:59 +0200 (Fri, 23 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30563:30668
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/intern/smoke/intern/FLUID_3D.h
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/library.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/scene.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sound.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editfont.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_sculpt.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_undo.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/script_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_input.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/undo.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/SConscript
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_util.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/include/render_types.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/include/volume_precache.h
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/volume_precache.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/volumetric.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqcache.c
Modified: branches/soc-2010-nicolasbishop/intern/smoke/intern/FLUID_3D.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/smoke/intern/FLUID_3D.h 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/intern/smoke/intern/FLUID_3D.h 2010-07-23 20:06:59 UTC (rev 30673)
@@ -30,6 +30,7 @@
#include <cstdlib>
#include <cmath>
+#include <cstring>
#include <iostream>
#include "OBSTACLE.h"
// #include "WTURBULENCE.h"
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -2782,7 +2782,7 @@
# Set the action active
for my_bone in ob_arms:
- if blenAction in my_bone.blenActionList:
+ if ob.animation_data and blenAction in my_bone.blenActionList:
ob.animation_data.action = blenAction
# print '\t\tSetting Action!', blenAction
# scene.update(1)
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -420,8 +420,7 @@
# Add an MTL with the same name as the obj if no MTLs are spesified.
temp_mtl = os.path.splitext((os.path.basename(filepath)))[0] + '.mtl'
- if os.path.exists(DIR + temp_mtl) and temp_mtl not in material_libs:
-# if sys.exists(DIR + temp_mtl) and temp_mtl not in material_libs:
+ if os.path.exists(os.path.join(DIR, temp_mtl)) and temp_mtl not in material_libs:
material_libs.append( temp_mtl )
del temp_mtl
@@ -435,11 +434,9 @@
unique_material_images[None]= None, False
for libname in material_libs:
- mtlpath= DIR + libname
+ mtlpath= os.path.join(DIR, libname)
if not os.path.exists(mtlpath):
-# if not sys.exists(mtlpath):
- #print '\tError Missing MTL: "%s"' % mtlpath
- pass
+ print ("\tError Missing MTL: '%s'" % mtlpath)
else:
#print '\t\tloading mtl: "%s"' % mtlpath
context_material= None
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -42,6 +42,9 @@
def unregister():
import bpy
+
+ bpy.types.Scene.RemoveProperty("network_render")
+
bpy.types.unregister(ui.NetRenderJob)
bpy.types.unregister(ui.NetRenderSettings)
bpy.types.unregister(ui.NetRenderSlave)
Modified: branches/soc-2010-nicolasbishop/release/scripts/op/object.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/op/object.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/op/object.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -113,46 +113,48 @@
return context.object
def execute(self, context):
- objs = context.selected_objects
+ select_new = []
+ act_new = None
+
+
+ selected_objects = context.selected_objects
obj_act = context.object
- if context.object not in objs:
- objs.append(context.object)
+ if context.object not in selected_objects:
+ selected_objects.append(context.object)
- if not self.properties.extend:
- # for obj in objs:
- # obj.select = False
- bpy.ops.object.select_all(action='DESELECT')
-
if self.properties.direction == 'PARENT':
- parents = []
- for obj in objs:
+ for obj in selected_objects:
parent = obj.parent
if parent:
- parents.append(parent)
-
if obj_act == obj:
- context.scene.objects.active = parent
+ act_new = parent
- parent.select = True
-
- if parents:
- return {'CANCELLED'}
+ select_new.append(parent)
else:
- children = []
- for obj in objs:
- children += list(obj.children)
- for obj_iter in children:
- obj_iter.select = True
+ for obj in selected_objects:
+ select_new.extend(obj.children)
- children.sort(key=lambda obj_iter: obj_iter.name)
- context.scene.objects.active = children[0]
+ if select_new:
+ select_new.sort(key=lambda obj_iter: obj_iter.name)
+ act_new = select_new[0]
- return {'FINISHED'}
+ # dont edit any object settings above this
+ if select_new:
+ if not self.properties.extend:
+ bpy.ops.object.select_all(action='DESELECT')
+ for obj in select_new:
+ obj.select = True
+ context.scene.objects.active = act_new
+ return {'FINISHED'}
+
+ return {'CANCELLED'}
+
+
class SubdivisionSet(bpy.types.Operator):
'''Sets a Subdivision Surface Level (1-5)'''
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -360,6 +360,7 @@
def unregister():
+ bpy.types.Scene.RemoveProperty("pose_templates")
unregister = bpy.types.unregister
for cls in classes:
unregister(cls)
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -562,23 +562,11 @@
toolsettings = context.tool_settings.image_paint
brush = toolsettings.brush
- wide_ui = context.region.width > narrowui
col = layout.split().column()
row = col.row()
- row.template_list(toolsettings, "brushes", toolsettings, "active_brush_index", rows=2)
+ col.template_ID_preview(toolsettings, "brush", new="brush.add", filter="is_imapaint_brush", rows=3, cols=8)
- col.template_ID(toolsettings, "brush", new="brush.add")
-
- if wide_ui:
- sub = layout.row(align=True)
- else:
- sub = layout.column(align=True)
- sub.prop_enum(brush, "imagepaint_tool", 'DRAW')
- sub.prop_enum(brush, "imagepaint_tool", 'SOFTEN')
- sub.prop_enum(brush, "imagepaint_tool", 'CLONE')
- sub.prop_enum(brush, "imagepaint_tool", 'SMEAR')
-
if brush:
col = layout.column()
col.template_color_wheel(brush, "color", value_slider=True)
@@ -604,6 +592,30 @@
col.prop(brush, "clone_alpha", text="Alpha")
+class IMAGE_PT_tools_brush_texture(bpy.types.Panel):
+ bl_space_type = 'IMAGE_EDITOR'
+ bl_region_type = 'UI'
+ bl_label = "Texture"
+ bl_default_closed = True
+
+ def poll(self, context):
+ sima = context.space_data
+ toolsettings = context.tool_settings.image_paint
+ return sima.show_paint and toolsettings.brush
+
+ def draw(self, context):
+ layout = self.layout
+
+ toolsettings = context.tool_settings.image_paint
+ brush = toolsettings.brush
+
+# tex_slot = brush.texture_slot
+
+ col = layout.column()
+
+ col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8)
+
+
class IMAGE_PT_paint_stroke(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'UI'
@@ -653,8 +665,15 @@
brush = toolsettings.brush
layout.template_curve_mapping(brush, "curve")
- layout.operator_menu_enum("brush.curve_preset", "shape")
+ row = layout.row(align=True)
+ row.operator("brush.curve_preset", icon="SMOOTHCURVE", text="").shape = 'SMOOTH'
+ row.operator("brush.curve_preset", icon="SPHERECURVE", text="").shape = 'ROUND'
+ row.operator("brush.curve_preset", icon="ROOTCURVE", text="").shape = 'ROOT'
+ row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
+ row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
+ row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
+ row.operator("brush.curve_preset", icon="RNDCURVE", text="").shape = 'MID9'
classes = [
IMAGE_MT_view,
@@ -669,6 +688,7 @@
IMAGE_HT_header,
IMAGE_PT_image_properties,
IMAGE_PT_paint,
+ IMAGE_PT_tools_brush_texture,
IMAGE_PT_paint_stroke,
IMAGE_PT_paint_curve,
IMAGE_PT_game_properties,
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py 2010-07-23 19:47:25 UTC (rev 30672)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py 2010-07-23 20:06:59 UTC (rev 30673)
@@ -486,7 +486,21 @@
col.prop(strip, "use_effect_default_fade", "Default fade")
if not strip.use_effect_default_fade:
col.prop(strip, "effect_fader", text="Effect fader")
+
+ layout.prop(strip, "use_translation", text="Image Offset:")
+ if strip.use_translation:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list