[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58745] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Tue Jul 30 20:43:26 CEST 2013
Revision: 58745
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58745
Author: gdh
Date: 2013-07-30 18:43:25 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58731 to r58744.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58731
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58744
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-cycles_mblur/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/SkinInfo.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/collada_internal.cpp
branches/soc-2013-cycles_mblur/source/blender/collada/collada_internal.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58730
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58744
Modified: branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh.h 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/intern/cycles/bvh/bvh.h 2013-07-30 18:43:25 UTC (rev 58745)
@@ -46,7 +46,7 @@
struct PackedBVH {
/* BVH nodes storage, one node is 4x int4, and contains two bounding boxes,
- * and child, triangle or object indexes dependening on the node type */
+ * and child, triangle or object indexes depending on the node type */
array<int4> nodes;
/* object index to BVH node index mapping for instances */
array<int> object_node;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_path.h 2013-07-30 18:43:25 UTC (rev 58745)
@@ -925,11 +925,8 @@
path_radiance_bsdf_bounce(L, &tp, &bsdf_eval, bsdf_pdf, state.bounce, label);
/* set labels */
- float min_ray_pdf = FLT_MAX;
+ float min_ray_pdf = fminf(bsdf_pdf, FLT_MAX);
- if(!(label & LABEL_TRANSPARENT))
- min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
-
/* modify path state */
PathState ps = state;
path_state_next(kg, &ps, label);
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h 2013-07-30 18:43:25 UTC (rev 58745)
@@ -438,7 +438,7 @@
/* Closure data */
-#define MAX_CLOSURE 16
+#define MAX_CLOSURE 64
typedef struct ShaderClosure {
ClosureType type;
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-30 18:43:25 UTC (rev 58745)
@@ -1973,7 +1973,9 @@
def draw(self, context):
layout = self.layout
+
with_freestyle = bpy.app.build_options.freestyle
+ scene = context.scene
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -1998,12 +2000,11 @@
layout.separator()
- if with_freestyle:
+ if with_freestyle and not scene.render.use_shading_nodes:
layout.operator("mesh.mark_freestyle_edge").clear = False
layout.operator("mesh.mark_freestyle_edge", text="Clear Freestyle Edge").clear = True
+ layout.separator()
- layout.separator()
-
layout.operator("mesh.edge_rotate", text="Rotate Edge CW").use_ccw = False
layout.operator("mesh.edge_rotate", text="Rotate Edge CCW").use_ccw = True
@@ -2028,7 +2029,9 @@
def draw(self, context):
layout = self.layout
+
with_freestyle = bpy.app.build_options.freestyle
+ scene = context.scene
layout.operator_context = 'INVOKE_REGION_WIN'
@@ -2044,12 +2047,11 @@
layout.separator()
- if with_freestyle:
+ if with_freestyle and not scene.render.use_shading_nodes:
layout.operator("mesh.mark_freestyle_face").clear = False
layout.operator("mesh.mark_freestyle_face", text="Clear Freestyle Face").clear = True
+ layout.separator()
- layout.separator()
-
layout.operator("mesh.poke")
layout.operator("mesh.quads_convert_to_tris")
layout.operator("mesh.tris_convert_to_quads")
@@ -2661,6 +2663,7 @@
with_freestyle = bpy.app.build_options.freestyle
mesh = context.active_object.data
+ scene = context.scene
split = layout.split()
@@ -2680,7 +2683,7 @@
col.prop(mesh, "show_edge_seams", text="Seams")
col.prop(mesh, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural)
col.prop(mesh, "show_edge_bevel_weight", text="Bevel")
- if with_freestyle:
+ if with_freestyle and not scene.render.use_shading_nodes:
col.prop(mesh, "show_freestyle_edge_marks", text="Edge Marks")
col.prop(mesh, "show_freestyle_face_marks", text="Face Marks")
Modified: branches/soc-2013-cycles_mblur/release/scripts/templates_py/custom_nodes.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/templates_py/custom_nodes.py 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/release/scripts/templates_py/custom_nodes.py 2013-07-30 18:43:25 UTC (rev 58745)
@@ -1,5 +1,5 @@
import bpy
-from bpy_types import NodeTree, Node, NodeSocket
+from bpy.types import NodeTree, Node, NodeSocket
# Implementation of custom nodes from Python
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_matrix.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_matrix.h 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_matrix.h 2013-07-30 18:43:25 UTC (rev 58745)
@@ -175,7 +175,7 @@
void translate_m4(float mat[4][4], float tx, float ty, float tz);
void rotate_m4(float mat[4][4], const char axis, const float angle);
void rotate_m2(float mat[2][2], const float angle);
-void pivot_m4(float mat[4][4], const float pivot[3]);
+void transform_pivot_set_m4(float mat[4][4], const float pivot[3]);
void mat3_to_rot_size(float rot[3][3], float size[3], float mat3[3][3]);
void mat4_to_loc_rot_size(float loc[3], float rot[3][3], float size[3], float wmat[4][4]);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h 2013-07-30 18:43:25 UTC (rev 58745)
@@ -116,9 +116,9 @@
MINLINE void mul_v4_fl(float r[4], float f);
MINLINE void mul_v4_v4fl(float r[3], const float a[3], float f);
MINLINE float mul_project_m4_v3_zfac(float mat[4][4], const float co[3]);
-MINLINE float mul_m3_v3_single_x(float M[3][3], const float a[3]);
-MINLINE float mul_m3_v3_single_y(float M[3][3], const float a[3]);
-MINLINE float mul_m3_v3_single_z(float M[3][3], const float a[3]);
+MINLINE float dot_m3_v3_row_x(float M[3][3], const float a[3]);
+MINLINE float dot_m3_v3_row_y(float M[3][3], const float a[3]);
+MINLINE float dot_m3_v3_row_z(float M[3][3], const float a[3]);
MINLINE void madd_v3_v3fl(float r[3], const float a[3], float f);
MINLINE void madd_v3_v3v3(float r[3], const float a[3], const float b[3]);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c 2013-07-30 18:43:25 UTC (rev 58745)
@@ -1374,8 +1374,15 @@
mat[1][0] = -mat[0][1];
}
-/* scale or rotate around a non zero pivot */
-void pivot_m4(float mat[4][4], const float pivot[3])
+/**
+ * Scale or rotate around a pivot point,
+ * a convenience function to avoid having to do inline.
+ *
+ * Since its common to make a scale/rotation matrix that pivots around an arbitrary point.
+ *
+ * Typical use case is to make 3x3 matrix, copy to 4x4, then pass to this function.
+ */
+void transform_pivot_set_m4(float mat[4][4], const float pivot[3])
{
float tmat[4][4];
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c 2013-07-30 12:56:39 UTC (rev 58744)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c 2013-07-30 18:43:25 UTC (rev 58745)
@@ -418,15 +418,18 @@
(mat[2][3] * co[2]) + mat[3][3];
}
-MINLINE float mul_m3_v3_single_x(float M[3][3], const float a[3])
+/**
+ * Has the effect of mul_m3_v3(), on a single axis.
+ */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list