[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43865] branches/bmesh/blender: svn merge ^/trunk/blender -r43830:43864
Campbell Barton
ideasman42 at gmail.com
Fri Feb 3 02:30:26 CET 2012
Revision: 43865
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43865
Author: campbellbarton
Date: 2012-02-03 01:30:21 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43830:43864
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43830
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/bmesh/blender/doc/blender_file_format/BlendFileReader.py
branches/bmesh/blender/intern/cycles/app/io_export_cycles_xml.py
branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/collada/GeometryExporter.cpp
branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/makesdna/DNA_curve_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/rna_dump.py
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/bmesh/blender/source/tests/bl_mesh_modifiers.py
branches/bmesh/blender/source/tests/bl_run_operators.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43830
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43864
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/CMakeLists.txt 2012-02-03 01:30:21 UTC (rev 43865)
@@ -249,6 +249,12 @@
"Choose the minimum OSX version required: 10.4 or 10.5"
FORCE)
endif()
+ if(${CMAKE_GENERATOR} MATCHES "Xcode" AND (${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4))
+ # Xcode 4 defaults to the Apple LLVM Compiler.
+ # Override the default compiler selection because Blender only compiles with gcc
+ set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+ message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+ endif()
option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
Modified: branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
===================================================================
--- branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -206,13 +206,13 @@
<td>${size}</td>
</tr>"""
- if field.Type.Structure == None or field.Name.IsPointer():
+ if field.Type.Structure is None or field.Name.IsPointer():
# ${reference}
reference = field.Name.AsReference(parentReference)
# ${struct}
- if parentReference != None:
+ if parentReference is not None:
struct = '<a href="#{0}">{0}</a>'.format(structure.Type.Name)
else:
struct = structure.Type.Name
@@ -240,7 +240,7 @@
structure_field = Template(structure_field_template).substitute(d)
- elif field.Type.Structure != None:
+ elif field.Type.Structure is not None:
reference = field.Name.AsReference(parentReference)
structure_field = self.StructureFields(field.Type.Structure, reference, offset)
Modified: branches/bmesh/blender/doc/blender_file_format/BlendFileReader.py
===================================================================
--- branches/bmesh/blender/doc/blender_file_format/BlendFileReader.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/doc/blender_file_format/BlendFileReader.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -329,7 +329,7 @@
self.Name = name
def AsReference(self, parent):
- if parent == None:
+ if parent is None:
result = ""
else:
result = parent+"."
Modified: branches/bmesh/blender/intern/cycles/app/io_export_cycles_xml.py
===================================================================
--- branches/bmesh/blender/intern/cycles/app/io_export_cycles_xml.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/intern/cycles/app/io_export_cycles_xml.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -93,7 +93,7 @@
@classmethod
def poll(cls, context):
- return context.active_object != None
+ return (context.active_object is not None)
def execute(self, context):
filepath = bpy.path.ensure_ext(self.filepath, ".xml")
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43830
+ /trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43864
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -44,7 +44,7 @@
properties = operator.properties if operator is not None else None
space_data = context.space_data
- if space_data.type != 'VIEW_3D':
+ if space_data and space_data.type != 'VIEW_3D':
space_data = None
# location
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/object.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/object.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -20,7 +20,10 @@
import bpy
from bpy.types import Operator
-from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty
+from bpy.props import (StringProperty,
+ BoolProperty,
+ EnumProperty,
+ IntProperty)
class SelectPattern(Operator):
@@ -54,7 +57,7 @@
pattern_match = fnmatch.fnmatchcase
else:
pattern_match = (lambda a, b:
- fnmatch.fnmatchcase(a.upper(), b.upper()))
+ fnmatch.fnmatchcase(a.upper(), b.upper()))
is_ebone = False
obj = context.object
if obj and obj.mode == 'POSE':
@@ -490,7 +493,7 @@
def execute(self, context):
ob_act = context.active_object
- objects = [ob for ob in C.selected_editable_objects if ob != ob_act]
+ objects = [ob for ob in context.selected_editable_objects if ob != ob_act]
if 1: # swap from/to, means we cant copy to many at once.
if len(objects) != 1:
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py 2012-02-03 01:30:21 UTC (rev 43865)
@@ -111,7 +111,7 @@
sub = col.column()
sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D'))
sub.prop(curve, "fill_mode", text="")
- col.prop(curve, "use_fill_deform", text="Fill Deformed")
+ col.prop(curve, "use_fill_deform")
class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel):
@@ -165,7 +165,11 @@
col.label(text="Bevel Object:")
col.prop(curve, "bevel_object", text="")
+ row = col.row()
+ row.active = (curve.bevel_object is not None)
+ row.prop(curve, "use_fill_caps")
+
class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel):
bl_label = "Path Animation"
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_texture.h 2012-02-03 01:30:21 UTC (rev 43865)
@@ -69,9 +69,9 @@
struct ColorBand *add_colorband(int rangetype);
int do_colorband(const struct ColorBand *coba, float in, float out[4]);
void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
-int vergcband(const void *a1, const void *a2);
struct CBData *colorband_element_add(struct ColorBand *coba, float position);
int colorband_element_remove(struct ColorBand *coba, int index);
+void colorband_update_sort(struct ColorBand *coba);
void default_tex(struct Tex *tex);
struct Tex *add_texture(const char *name);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2012-02-03 01:06:32 UTC (rev 43864)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2012-02-03 01:30:21 UTC (rev 43865)
@@ -224,6 +224,50 @@
/* -------------- Space-Conversion API -------------- */
+static void constraint_pchan_diff_mat(bPoseChannel *pchan, float diff_mat[4][4])
+{
+ if (pchan->parent) {
+ float offs_bone[4][4];
+
+ /* construct offs_bone the same way it is done in armature.c */
+ copy_m4_m3(offs_bone, pchan->bone->bone_mat);
+ copy_v3_v3(offs_bone[3], pchan->bone->head);
+ offs_bone[3][1] += pchan->bone->parent->length;
+
+ if (pchan->bone->flag & BONE_HINGE) {
+ /* pose_mat = par_pose-space_location * chan_mat */
+ float tmat[4][4];
+
+ /* the rotation of the parent restposition */
+ copy_m4_m4(tmat, pchan->bone->parent->arm_mat);
+
+ /* the location of actual parent transform */
+ copy_v3_v3(tmat[3], offs_bone[3]);
+ zero_v3(offs_bone[3]);
+ mul_m4_v3(pchan->parent->pose_mat, tmat[3]);
+
+ mult_m4_m4m4(diff_mat, tmat, offs_bone);
+ }
+ else {
+ /* pose_mat = par_pose_mat * bone_mat * chan_mat */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list