[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59377] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Thu Aug 22 02:50:11 CEST 2013
Revision: 59377
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59377
Author: gdh
Date: 2013-08-22 00:50:10 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59332 to r59376.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59332
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59376
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_subsurface.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_displist.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/displist.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/sound.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_sort.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/sort.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/bmesh.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_texture.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/space_image.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59331
+ /branches/ge_dev:58091-58422
/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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59376
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-08-21 23:33:50 UTC (rev 59376)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh.h 2013-08-22 00:50:10 UTC (rev 59377)
@@ -782,6 +782,7 @@
#if defined(__SUBSURFACE__)
#define BVH_FUNCTION_NAME bvh_intersect_subsurface
+#define BVH_FUNCTION_FEATURES 0
#include "kernel_bvh_subsurface.h"
#endif
@@ -793,7 +794,7 @@
#if defined(__SUBSURFACE__) && defined(__HAIR__)
#define BVH_FUNCTION_NAME bvh_intersect_subsurface_hair
-#define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH
+#define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR
#include "kernel_bvh_subsurface.h"
#endif
@@ -805,7 +806,7 @@
#if defined(__SUBSURFACE__) && defined(__HAIR__) && defined(__OBJECT_MOTION__)
#define BVH_FUNCTION_NAME bvh_intersect_subsurface_hair_motion
-#define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_HAIR_MINIMUM_WIDTH|BVH_MOTION
+#define BVH_FUNCTION_FEATURES BVH_INSTANCING|BVH_HAIR|BVH_MOTION
#include "kernel_bvh_subsurface.h"
#endif
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_subsurface.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_subsurface.h 2013-08-21 23:33:50 UTC (rev 59376)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_bvh_subsurface.h 2013-08-22 00:50:10 UTC (rev 59377)
@@ -207,7 +207,13 @@
--stackPtr;
/* primitive intersection */
- while(primAddr < primAddr2) {
+ for(; primAddr < primAddr2; primAddr++) {
+#if FEATURE(BVH_HAIR)
+ uint segment = kernel_tex_fetch(__prim_segment, primAddr);
+ if(segment != ~0)
+ continue;
+#endif
+
/* only primitives from the same object */
uint tri_object = (object == ~0)? kernel_tex_fetch(__prim_object, primAddr): object;
@@ -216,8 +222,6 @@
/* intersect ray against primitive */
bvh_triangle_intersect_subsurface(kg, isect_array, P, idir, object, primAddr, tmax, &num_hits, lcg_state, max_hits);
}
-
- primAddr++;
}
}
#if FEATURE(BVH_INSTANCING)
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-21 23:33:50 UTC (rev 59376)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-22 00:50:10 UTC (rev 59377)
@@ -189,6 +189,8 @@
sc.sample_weight = sample_weight;
sc.type = CLOSURE_EMISSION_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
/* flag */
@@ -204,6 +206,8 @@
sc.sample_weight = sample_weight;
sc.type = CLOSURE_AMBIENT_OCCLUSION_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
if(sd->num_closure < MAX_CLOSURE) {
@@ -215,6 +219,8 @@
case OSL::ClosurePrimitive::Holdout: {
sc.sample_weight = 0.0f;
sc.type = CLOSURE_HOLDOUT_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
if(sd->num_closure < MAX_CLOSURE) {
Modified: branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py 2013-08-21 23:33:50 UTC (rev 59376)
+++ branches/soc-2013-cycles_mblur/release/scripts/freestyle/style_modules/parameter_editor.py 2013-08-22 00:50:10 UTC (rev 59377)
@@ -38,24 +38,29 @@
from logical_operators import AndUP1D, NotUP1D, OrUP1D
from shaders import pyBluePrintCirclesShader, pyBluePrintEllipsesShader, pyBluePrintSquaresShader
+
class ColorRampModifier(StrokeShader):
def __init__(self, blend, influence, ramp):
StrokeShader.__init__(self)
self.__blend = blend
self.__influence = influence
self.__ramp = ramp
+
def evaluate(self, t):
col = freestyle.evaluateColorRamp(self.__ramp, t)
- col = col.xyz # omit alpha
+ col = col.xyz # omit alpha
return col
+
def blend_ramp(self, a, b):
return freestyle.blendRamp(self.__blend, a, self.__influence, b)
+
class ScalarBlendModifier(StrokeShader):
def __init__(self, blend, influence):
StrokeShader.__init__(self)
self.__blend = blend
self.__influence = influence
+
def blend(self, v1, v2):
fac = self.__influence
facm = 1.0 - fac
@@ -64,7 +69,7 @@
elif self.__blend == 'ADD':
v1 += fac * v2
elif self.__blend == 'MULTIPLY':
- v1 *= facm + fac * v2;
+ v1 *= facm + fac * v2
elif self.__blend == 'SUBTRACT':
v1 -= fac * v2
elif self.__blend == 'DIVIDE':
@@ -84,6 +89,7 @@
raise ValueError("unknown curve blend type: " + self.__blend)
return v1
+
class CurveMappingModifier(ScalarBlendModifier):
def __init__(self, blend, influence, mapping, invert, curve):
ScalarBlendModifier.__init__(self, blend, influence)
@@ -91,19 +97,24 @@
self.__mapping = getattr(self, mapping)
self.__invert = invert
self.__curve = curve
+
def LINEAR(self, t):
if self.__invert:
return 1.0 - t
return t
+
def CURVE(self, t):
return freestyle.evaluateCurveMappingF(self.__curve, 0, t)
+
def evaluate(self, t):
return self.__mapping(t)
+
class ThicknessModifierMixIn:
def __init__(self):
scene = freestyle.getCurrentScene()
self.__persp_camera = (scene.camera.data.type == 'PERSP')
+
def set_thickness(self, sv, outer, inner):
fe = sv.first_svertex.get_fedge(sv.second_svertex)
nature = fe.nature
@@ -114,20 +125,22 @@
dir = point.dot(fe.normal_left)
else:
dir = fe.normal_left.z
- if dir < 0.0: # the back side is visible
+ if dir < 0.0: # the back side is visible
outer, inner = inner, outer
elif (nature & Nature.SILHOUETTE):
- if fe.is_smooth: # TODO more tests needed
+ if fe.is_smooth: # TODO more tests needed
outer, inner = inner, outer
else:
outer = inner = (outer + inner) / 2
sv.attribute.thickness = (outer, inner)
+
class ThicknessBlenderMixIn(ThicknessModifierMixIn):
def __init__(self, position, ratio):
ThicknessModifierMixIn.__init__(self)
self.__position = position
self.__ratio = ratio
+
def blend_thickness(self, outer, inner, v):
if self.__position == 'CENTER':
outer = self.blend(outer, v / 2)
@@ -145,9 +158,11 @@
raise ValueError("unknown thickness position: " + self.__position)
return outer, inner
+
class BaseColorShader(ConstantColorShader):
pass
+
class BaseThicknessShader(StrokeShader, ThicknessModifierMixIn):
def __init__(self, thickness, position, ratio):
StrokeShader.__init__(self)
@@ -166,6 +181,7 @@
self.__inner = thickness * (1 - ratio)
else:
raise ValueError("unknown thickness position: " + self.position)
+
def shade(self, stroke):
it = stroke.stroke_vertices_begin()
while not it.is_end:
@@ -173,6 +189,7 @@
self.set_thickness(sv, self.__outer, self.__inner)
it.increment()
+
# Along Stroke modifiers
def iter_t2d_along_stroke(stroke):
@@ -183,11 +200,12 @@
while not it.is_end:
p = it.object.point
distance += (prev - p).length
- prev = p.copy() # need a copy because the point can be altered
+ prev = p.copy() # need a copy because the point can be altered
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list