[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30796] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30764 :30795
Nicholas Bishop
nicholasbishop at gmail.com
Tue Jul 27 08:48:09 CEST 2010
Revision: 30796
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30796
Author: nicholasbishop
Date: 2010-07-27 08:48:09 +0200 (Tue, 27 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30764:30795
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_IReader.h
branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/text.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_vector_inline.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/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_layout.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_input.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_brush.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-07-27 06:48:09 UTC (rev 30796)
@@ -115,6 +115,7 @@
OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking" OFF)
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
IF(APPLE)
OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -130,6 +131,10 @@
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
+IF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+ MESSAGE("WARNING: WITH_PYTHON_INSTALL needs WITH_INSTALL")
+ENDIF(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
+
TEST_SSE_SUPPORT()
# disabled for now, not supported
Modified: branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_IReader.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_IReader.h 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_IReader.h 2010-07-27 06:48:09 UTC (rev 30796)
@@ -60,7 +60,7 @@
virtual void seek(int position)=0;
/**
- * Returns an aproximated length of the source in samples.
+ * Returns an approximated length of the source in samples.
* For readers of the type buffer this has to return a correct value!
* \return The length as sample count. May be negative if unknown.
* \see getType
Modified: branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_StreamBufferFactory.cpp 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_StreamBufferFactory.cpp 2010-07-27 06:48:09 UTC (rev 30796)
@@ -44,7 +44,7 @@
int index = 0;
sample_t* buffer;
- // get an aproximated size if possible
+ // get an approximated size if possible
int size = reader->getLength();
if(size <= 0)
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -883,15 +883,13 @@
# REMOVE DUMMYVERT, - remove this in the next release when blenders internal are fixed.
+ for ob in importedObjects:
+ if ob.type == 'MESH':
+ me = ob.data
+# me.verts.delete([me.verts[0],]) # XXX, todo
+ if not APPLY_MATRIX:
+ me.transform(ob.matrix_world.copy().invert())
-# for ob in importedObjects:
-# if ob.type == 'MESH':
-# # if ob.type=='Mesh':
-# me = ob.getData(mesh=1)
-# me.verts.delete([me.verts[0],])
-# if not APPLY_MATRIX:
-# me.transform(ob.matrix_world.copy().invert())
-
# Done DUMMYVERT
"""
if IMPORT_AS_INSTANCE:
@@ -1009,15 +1007,19 @@
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
-
filepath = StringProperty(name="File Path", description="Filepath used for importing the 3DS file", maxlen= 1024, default= "")
-# size_constraint = FloatProperty(name="Size Constraint", description="Scale the model by 10 until it reacehs the size constraint. Zero Disables.", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=10.0),
-# search_images = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True),
-# apply_matrix = BoolProperty(name="Transform Fix", description="Workaround for object transformations importing incorrectly", default=False),
+ constrain_size = FloatProperty(name="Size Constraint", description="Scale the model by 10 until it reacehs the size constraint. Zero Disables.", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=10.0)
+ search_images = BoolProperty(name="Image Search", description="Search subdirectories for any assosiated images (Warning, may be slow)", default=True)
+ apply_transform = BoolProperty(name="Apply Transform", description="Workaround for object transformations importing incorrectly", default=False)
def execute(self, context):
- load_3ds(self.properties.filepath, context, 0.0, False, False)
+ load_3ds(self.properties.filepath,
+ context,
+ IMPORT_CONSTRAIN_BOUNDS=self.properties.constrain_size,
+ IMAGE_SEARCH=self.properties.search_images,
+ APPLY_MATRIX=self.properties.apply_transform)
+
return {'FINISHED'}
def invoke(self, context, event):
Modified: branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -67,7 +67,7 @@
stdout = io.StringIO()
stderr = io.StringIO()
else:
- namespace = {'__builtins__': __builtins__, 'bpy': bpy}
+ namespace = {"__builtins__": __builtins__, "bpy": bpy, "C": bpy.context}
console = InteractiveConsole(locals=namespace, filename="<blender_console>")
import io
@@ -97,10 +97,6 @@
console, stdout, stderr = get_console(hash(context.region))
- # Hack, useful but must add some other way to access
- #if "C" not in console.locals:
- console.locals["C"] = context
-
# redirect output
sys.stdout = stdout
sys.stderr = stderr
@@ -243,10 +239,6 @@
add_scrollback("", 'OUTPUT')
sc.prompt = PROMPT
- # Add context into the namespace for quick access
- console = get_console(hash(context.region))[0]
- console.locals["C"] = bpy.context
-
return {'FINISHED'}
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -120,6 +120,7 @@
if wide_ui:
col = split.column()
col.prop(arm, "draw_group_colors", text="Colors")
+ col.prop(ob, "x_ray", text="X-Ray")
col.prop(arm, "delay_deform", text="Delay Refresh")
@@ -173,8 +174,6 @@
# TODO: this panel will soon be depreceated too
-
-
class DATA_PT_ghost(DataButtonsPanel):
bl_label = "Ghost"
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -437,6 +437,7 @@
col.prop(md, "levels", text="Preview")
col.prop(md, "edit_levels", text="Edit")
col.prop(md, "render_levels", text="Render")
+ col.prop(md, "optimal_display")
if wide_ui:
col = split.column()
@@ -446,7 +447,6 @@
col.operator("object.multires_higher_levels_delete", text="Delete Higher")
col.operator("object.multires_reshape", text="Reshape")
col.operator("object.multires_base_apply", text="Apply Base")
- col.prop(md, "optimal_display")
layout.separator()
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -90,6 +90,13 @@
layout.operator("node.view_all")
+ if context.space_data.backdrop:
+ layout.separator()
+
+ layout.operator("node.backimage_move",text = "Backdrop move")
+ layout.operator("node.backimage_zoom",text = "Backdrop zoom in").factor = 1.2
+ layout.operator("node.backimage_zoom",text = "Backdrop zoom out").factor = 0.833
+
layout.separator()
layout.operator("screen.area_dupli")
@@ -131,6 +138,7 @@
layout.separator()
layout.operator("node.link_make")
layout.operator("node.link_make", text="Make and Replace Links").replace = True
+ layout.operator("node.links_cut")
layout.separator()
layout.operator("node.group_edit")
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py 2010-07-27 06:06:36 UTC (rev 30795)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py 2010-07-27 06:48:09 UTC (rev 30796)
@@ -327,16 +327,10 @@
row.separator()
row.separator()
- sculpt = context.tool_settings.sculpt
col = row.column()
- col.label(text="Paint and Sculpt:")
- col.prop(edit, "sculpt_paint_use_unified_size", text="Unify Size")
- col.prop(edit, "sculpt_paint_use_unified_strength", text="Unify Strength")
row = col.row(align=True)
row.label("Overlay Color:")
row.prop(edit, "sculpt_paint_overlay_col", text="")
- col.prop(sculpt, "use_openmp", text="Threaded Sculpt")
- col.prop(sculpt, "show_brush")
col.separator()
col.separator()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list