[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57461] branches/soc-2013-cycles_mblur: Merged trunk into branch at r57459.
Gavin Howard
gavin.d.howard at gmail.com
Sat Jun 15 09:02:12 CEST 2013
Revision: 57461
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57461
Author: gdh
Date: 2013-06-15 07:02:11 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
Merged trunk into branch at r57459.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57459
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_montecarlo.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_projection.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-cycles_mblur/intern/cycles/util/util_opencl.cpp
branches/soc-2013-cycles_mblur/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_tracking.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/lamp.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifier.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/nla.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/node.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/texture.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/world.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/collada/TransformWriter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/collada_utils.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/intern/COM_compositor.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_MovieClipOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_TrackPositionOperation.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_object.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_regions.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_bake.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_composite.h
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/sss.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/zbuf.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_GameObject.cpp
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
+ /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:57388-57459
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp 2013-06-15 07:02:11 UTC (rev 57461)
@@ -209,7 +209,8 @@
/* light is handled separately */
if(object_is_light(b_ob)) {
- if(!motion)
+ /* don't use lamps for excluded layers used as mask layer */
+ if(!motion && !((layer_flag & render_layer.holdout_layer) && (layer_flag & render_layer.exclude_layer)))
sync_light(b_parent, persistent_id, b_ob, tfm);
return NULL;
@@ -317,8 +318,12 @@
return object;
}
-static bool object_render_hide_original(BL::Object::dupli_type_enum dupli_type)
+static bool object_render_hide_original(BL::Object::type_enum ob_type, BL::Object::dupli_type_enum dupli_type)
{
+ /* metaball exception, they duplicate self */
+ if(ob_type == BL::Object::type_META)
+ return false;
+
return (dupli_type == BL::Object::dupli_type_VERTS ||
dupli_type == BL::Object::dupli_type_FACES ||
dupli_type == BL::Object::dupli_type_FRAMES);
@@ -351,7 +356,7 @@
/* hide original object for duplis */
BL::Object parent = b_ob.parent();
- if(parent && object_render_hide_original(parent.dupli_type()))
+ if(parent && object_render_hide_original(b_ob.type(), parent.dupli_type()))
if(parent_hide)
hide = true;
@@ -363,7 +368,7 @@
{
BL::Object parent = b_ob.parent();
- return (parent && object_render_hide_original(parent.dupli_type()));
+ return (parent && object_render_hide_original(b_ob.type(), parent.dupli_type()));
}
/* Object Loop */
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_session.cpp 2013-06-15 07:02:11 UTC (rev 57461)
@@ -102,12 +102,16 @@
/* create sync */
sync = new BlenderSync(b_engine, b_data, b_scene, scene, !background, session->progress, session_params.device.type == DEVICE_CPU);
- /* for final render we will do data sync per render layer */
if(b_v3d) {
+ /* full data sync */
sync->sync_data(b_v3d, b_engine.camera_override());
sync->sync_view(b_v3d, b_rv3d, width, height);
}
else {
+ /* for final render we will do full data sync per render layer, only
+ * do some basic syncing here, no objects or materials for speed */
+ sync->sync_render_layers(b_v3d, NULL);
+ sync->sync_integrator();
sync->sync_camera(b_render, b_engine.camera_override(), width, height);
}
@@ -373,8 +377,8 @@
scene->integrator->tag_update(scene);
/* update scene */
+ sync->sync_camera(b_render, b_engine.camera_override(), width, height);
sync->sync_data(b_v3d, b_engine.camera_override(), b_rlay_name.c_str());
- sync->sync_camera(b_render, b_engine.camera_override(), width, height);
/* update number of samples per layer */
int samples = sync->get_layer_samples();
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -56,6 +56,8 @@
/* sync */
bool sync_recalc();
void sync_data(BL::SpaceView3D b_v3d, BL::Object b_override, const char *layer = 0);
+ void sync_render_layers(BL::SpaceView3D b_v3d, const char *layer);
+ void sync_integrator();
void sync_camera(BL::RenderSettings b_render, BL::Object b_override, int width, int height);
void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height);
int get_layer_samples() { return render_layer.samples; }
@@ -74,10 +76,8 @@
void sync_objects(BL::SpaceView3D b_v3d, int motion = 0);
void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override);
void sync_film();
- void sync_integrator();
void sync_view();
void sync_world(bool update_all);
- void sync_render_layers(BL::SpaceView3D b_v3d, const char *layer);
void sync_shaders();
void sync_curve_settings();
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_montecarlo.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_montecarlo.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_montecarlo.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -39,7 +39,7 @@
/// [-1,1] uniformly distributed over a unit sphere.
__device void to_unit_disk(float *x, float *y)
{
- float phi = 2.0f * M_PI_F * (*x);
+ float phi = M_2PI_F * (*x);
float r = sqrtf(*y);
*x = r * cosf(phi);
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_projection.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_projection.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_projection.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -57,7 +57,7 @@
__device float2 direction_to_equirectangular(float3 dir)
{
- float u = -atan2f(dir.y, dir.x)/(2.0f*M_PI_F) + 0.5f;
+ float u = -atan2f(dir.y, dir.x)/(M_2PI_F) + 0.5f;
float v = atan2f(dir.z, hypotf(dir.x, dir.y))/M_PI_F + 0.5f;
return make_float2(u, v);
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_normal_map.osl
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_normal_map.osl 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/shaders/node_normal_map.osl 2013-06-15 07:02:11 UTC (rev 57461)
@@ -37,7 +37,7 @@
getattribute("geom:is_smooth", is_smooth);
if (!is_smooth)
- ninterp = Ng;
+ ninterp = normalize(transform("world", "object", Ng));
// get _unnormalized_ interpolated normal and tangent
if (getattribute(attr_name, tangent) &&
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -359,10 +359,10 @@
case NODE_LAYER_WEIGHT:
svm_node_layer_weight(sd, stack, node);
break;
+#ifdef __EXTRA_NODES__
case NODE_WIREFRAME:
svm_node_wireframe(kg, sd, stack, node.y, node.z, node.w);
break;
-#ifdef __EXTRA_NODES__
case NODE_WAVELENGTH:
svm_node_wavelength(sd, stack, node.y, node.z);
break;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_tex_coord.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_tex_coord.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_tex_coord.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -241,10 +241,13 @@
float sign = primitive_attribute_float(kg, sd, attr_sign_elem, attr_sign_offset, NULL, NULL);
float3 normal;
- if(sd->shader & SHADER_SMOOTH_NORMAL)
+ if(sd->shader & SHADER_SMOOTH_NORMAL) {
normal = primitive_attribute_float3(kg, sd, attr_normal_elem, attr_normal_offset, NULL, NULL);
- else
- normal = sd->N;
+ }
+ else {
+ normal = sd->Ng;
+ object_inverse_normal_transform(kg, sd, &normal);
+ }
/* apply normal map */
float3 B = sign * cross(normal, tangent);
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_texture.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_texture.h 2013-06-15 06:03:15 UTC (rev 57460)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/svm/svm_texture.h 2013-06-15 07:02:11 UTC (rev 57461)
@@ -185,7 +185,7 @@
return 0.5f + 0.5f * sinf(a);
}
else if(wave == NODE_WAVE_SAW) {
- float b = 2.0f*M_PI_F;
+ float b = M_2PI_F;
int n = float_to_int(a / b);
a -= n*b;
if(a < 0.0f) a += b;
@@ -193,7 +193,7 @@
return a / b;
}
else if(wave == NODE_WAVE_TRI) {
- float b = 2.0f*M_PI_F;
+ float b = M_2PI_F;
float rmax = 1.0f;
return rmax - 2.0f*fabsf(floorf((a*(1.0f/b))+0.5f) - (a*(1.0f/b)));
Modified: branches/soc-2013-cycles_mblur/intern/cycles/util/util_opencl.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list