[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58073] branches/soc-2013-depsgraph_mt: Merging r57989 through r58072 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jul 8 13:29:08 CEST 2013
Revision: 58073
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58073
Author: nazgul
Date: 2013-07-08 11:29:08 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Merging r57989 through r58072 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57989
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58072
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_object.cpp
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/armature/armature_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/curve/editcurve.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_armature.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/editors/include/UI_interface.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_regions.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/resources.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_add.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/python/BPy_ContextFunctions.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/stroke/Canvas.h
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
branches/soc-2013-depsgraph_mt/source/blender/freestyle/intern/stroke/ContextFunctions.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/convertblender.c
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/WM_api.h
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-depsgraph_mt/source/creator/creator.c
Added Paths:
-----------
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_normals.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57988
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58072
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/CMakeLists.txt 2013-07-08 11:29:08 UTC (rev 58073)
@@ -25,6 +25,10 @@
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2")
+ set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
# for OSL
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_object.cpp 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_object.cpp 2013-07-08 11:29:08 UTC (rev 58073)
@@ -304,7 +304,7 @@
}
if (b_dupli_ob) {
- object->dupli_generated = get_float3(b_dupli_ob.orco());
+ object->dupli_generated = 0.5f*get_float3(b_dupli_ob.orco()) - make_float3(0.5f, 0.5f, 0.5f);
object->dupli_uv = get_float2(b_dupli_ob.uv());
}
else {
Modified: branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/ChainingIterators.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/ChainingIterators.py 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/ChainingIterators.py 2013-07-08 11:29:08 UTC (rev 58073)
@@ -24,6 +24,8 @@
from freestyle import AdjacencyIterator, ChainingIterator, ExternalContourUP1D, Nature, TVertex
from freestyle import ContextFunctions as CF
+import bpy
+
## the natural chaining iterator
## It follows the edges of same nature following the topology of
## objects with preseance on silhouettes, then borders,
@@ -212,7 +214,7 @@
visitNext = 1
break
if visitNext != 0:
- break
+ break
count = count+1
winner = ve
it.increment()
@@ -238,14 +240,22 @@
self._timeStamp = CF.get_time_stamp()+self._nRounds
def traverse(self, iter):
winner = None
+ found = False
it = AdjacencyIterator(iter)
while not it.is_end:
ve = it.object
if ve.id == self.current_edge.id:
+ found = True
it.increment()
continue
winner = ve
it.increment()
+ if not found:
+ # This is a fatal error condition: self.current_edge must be found
+ # among the edges seen by the AdjacencyIterator [bug #35695].
+ if bpy.app.debug_freestyle:
+ print('pySketchyChainingIterator: current edge not found')
+ return None
if winner is None:
winner = self.current_edge
if winner.chaining_time_stamp == self._timeStamp:
Modified: branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/parameter_editor.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/parameter_editor.py 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/release/scripts/freestyle/style_modules/parameter_editor.py 2013-07-08 11:29:08 UTC (rev 58073)
@@ -32,7 +32,7 @@
FalseBP1D, FalseUP1D, GuidingLinesShader, Interface0DIterator, Nature, Noise, Normal2DF0D, Operators, \
PolygonalizationShader, QuantitativeInvisibilityF1D, QuantitativeInvisibilityUP1D, SamplingShader, \
SpatialNoiseShader, StrokeAttribute, StrokeShader, TipRemoverShader, TrueBP1D, TrueUP1D, UnaryPredicate0D, \
- UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D
+ UnaryPredicate1D, VertexOrientation2DF0D, WithinImageBoundaryUP1D, ContextFunctions
from Functions0D import CurveMaterialF0D
from PredicatesU1D import pyNatureUP1D
from logical_operators import AndUP1D, NotUP1D, OrUP1D
@@ -1046,17 +1046,7 @@
selection_criteria.append(upred)
# prepare selection criteria by image border
if lineset.select_by_image_border:
- fac = scene.render.resolution_percentage / 100.0
- w = scene.render.resolution_x * fac
- h = scene.render.resolution_y * fac
- if scene.render.use_border:
- xmin = scene.render.border_min_x * w
- xmax = scene.render.border_max_x * w
- ymin = scene.render.border_min_y * h
- ymax = scene.render.border_max_y * h
- else:
- xmin, xmax = 0.0, float(w)
- ymin, ymax = 0.0, float(h)
+ xmin, ymin, xmax, ymax = ContextFunctions.get_border()
upred = WithinImageBoundaryUP1D(xmin, ymin, xmax, ymax)
selection_criteria.append(upred)
# select feature edges
Modified: branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/anim_utils.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/anim_utils.py 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/anim_utils.py 2013-07-08 11:29:08 UTC (rev 58073)
@@ -31,6 +31,7 @@
only_selected=False,
do_pose=True,
do_object=True,
+ do_visual_keying=True,
do_constraint_clear=False,
do_parents_clear=False,
do_clean=False,
@@ -53,7 +54,9 @@
:type do_pose: bool
:arg do_object: Bake objects.
:type do_object: bool
- :arg do_constraint_clear: Remove constraints (and do 'visual keying').
+ :arg do_visual_keying: Use the final transformations for baking ('visual keying')
+ :type do_visual_keying: bool
+ :arg do_constraint_clear: Remove constraints after baking.
:type do_constraint_clear: bool
:arg do_parents_clear: Unparent after baking objects.
:type do_parents_clear: bool
@@ -83,14 +86,14 @@
if do_parents_clear:
def obj_frame_info(obj, do_visual_keying):
parent = obj.parent
- matrix = obj.matrix_local if do_visual_keying else obj.matrix_basis
+ matrix = obj.matrix_local if do_visual_keying else obj.matrix_local
if parent:
return parent.matrix_world * matrix
else:
return matrix.copy()
else:
def obj_frame_info(obj, do_visual_keying):
- return obj.matrix_local.copy() if do_visual_keying else obj.matrix_basis.copy()
+ return obj.matrix_local.copy() if do_visual_keying else obj.matrix_local.copy()
# -------------------------------------------------------------------------
# Setup the Context
@@ -118,10 +121,11 @@
for f in frame_range:
scene.frame_set(f)
+ scene.update()
if do_pose:
- pose_info.append(pose_frame_info(obj, do_constraint_clear))
+ pose_info.append(pose_frame_info(obj, do_visual_keying))
if do_object:
- obj_info.append(obj_frame_info(obj, do_constraint_clear))
+ obj_info.append(obj_frame_info(obj, do_visual_keying))
# -------------------------------------------------------------------------
# Create action
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/anim.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/anim.py 2013-07-08 08:56:46 UTC (rev 58072)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/anim.py 2013-07-08 11:29:08 UTC (rev 58073)
@@ -190,6 +190,11 @@
description="Only key selected object/bones",
default=True,
)
+ visual_keying = BoolProperty(
+ name="Visual Keying",
+ description="Keyframe from the final transformations (with constraints applied)",
+ default=False,
+ )
clear_constraints = BoolProperty(
name="Clear Constraints",
description="Remove all constraints from keyed object/bones, and do 'visual' keying",
@@ -220,6 +225,7 @@
only_selected=self.only_selected,
do_pose='POSE' in self.bake_types,
do_object='OBJECT' in self.bake_types,
+ do_visual_keying=self.visual_keying,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list