[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58186] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Jul 12 02:29:06 CEST 2013
Revision: 58186
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58186
Author: gdh
Date: 2013-07-12 00:29:06 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58131 to r58184.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58131
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58184
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/__init__.py
branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_camera.h
branches/soc-2013-cycles_mblur/intern/cycles/render/graph.cpp
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/scene.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/unit.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector.c
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_interp.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_relations.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_render.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/physics/particle_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_preview.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.h
branches/soc-2013-cycles_mblur/source/blender/editors/util/undo.c
branches/soc-2013-cycles_mblur/source/blender/freestyle/intern/view_map/ViewMap.cpp
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/tiff.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-cycles_mblur/source/blender/render/extern/include/RE_engine.h
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/external_engine.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58130
+ /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-58184
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-07-12 00:29:06 UTC (rev 58186)
@@ -2,10 +2,12 @@
# Find the native Python includes and library
#
# Note:, This is not _yet_ intended to be a general python module for other
-# projects to use since its hard coded to python 3.2 as blender only supports
-# a single python version.
-# This is for blender/unix python only.
+# projects to use since its hard coded to fixed Python version
+# as Blender only supports a single Python version at the moment.
#
+# Note:
+# this is for Blender/Unix Python only.
+#
# This module defines
# PYTHON_VERSION
# PYTHON_INCLUDE_DIRS
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/__init__.py 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/__init__.py 2013-07-12 00:29:06 UTC (rev 58186)
@@ -41,6 +41,7 @@
bl_use_shading_nodes = True
bl_use_preview = True
bl_use_exclude_layers = True
+ bl_use_save_buffers = True
def __init__(self):
self.session = None
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/addon/ui.py 2013-07-12 00:29:06 UTC (rev 58186)
@@ -213,23 +213,25 @@
subsub.enabled = not rd.use_border
subsub.prop(rd, "use_save_buffers")
- col = split.column()
+ col = split.column(align=True)
- sub = col.column(align=True)
- sub.label(text="Acceleration structure:")
- sub.prop(cscene, "debug_bvh_type", text="")
- sub.prop(cscene, "debug_use_spatial_splits")
- sub.prop(cscene, "use_cache")
+ col.label(text="Viewport:")
+ col.prop(cscene, "debug_bvh_type", text="")
+ col.separator()
+ col.prop(cscene, "preview_start_resolution")
- sub = col.column(align=True)
- sub.label(text="Viewport:")
- sub.prop(cscene, "preview_start_resolution")
+ col.separator()
- sub = col.column(align=True)
- sub.label(text="Final Render:")
- sub.prop(rd, "use_persistent_data", text="Persistent Images")
+ col.label(text="Final Render:")
+ col.prop(cscene, "use_cache")
+ col.prop(rd, "use_persistent_data", text="Persistent Images")
+ col.separator()
+ col.label(text="Acceleration structure:")
+ col.prop(cscene, "debug_use_spatial_splits")
+
+
class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
bl_label = "OpenGL Render"
bl_options = {'DEFAULT_CLOSED'}
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_camera.h 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_camera.h 2013-07-12 00:29:06 UTC (rev 58186)
@@ -166,6 +166,12 @@
ray->D = panorama_to_direction(kg, Pcamera.x, Pcamera.y);
+ /* indicates ray should not receive any light, outside of the lens */
+ if(is_zero(ray->D)) {
+ ray->t = 0.0f;
+ return;
+ }
+
/* modify ray for depth of field */
float aperturesize = kernel_data.cam.aperturesize;
@@ -186,12 +192,6 @@
ray->D = normalize(Pfocus - ray->P);
}
- /* indicates ray should not receive any light, outside of the lens */
- if(is_zero(ray->D)) {
- ray->t = 0.0f;
- return;
- }
-
/* transform ray from camera to world */
Transform cameratoworld = kernel_data.cam.cameratoworld;
Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/graph.cpp 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/graph.cpp 2013-07-12 00:29:06 UTC (rev 58186)
@@ -347,8 +347,9 @@
if(tonode->special_type == SHADER_SPECIAL_TYPE_AUTOCONVERT) {
bool all_links_removed = true;
+ vector<ShaderInput*> links = tonode->outputs[0]->links;
- foreach(ShaderInput *autoin, tonode->outputs[0]->links) {
+ foreach(ShaderInput *autoin, links) {
if(autoin->default_value == ShaderInput::NONE)
all_links_removed = false;
else
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-12 00:29:06 UTC (rev 58186)
@@ -655,21 +655,25 @@
void *DM_get_vert_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumVerts(dm));
return CustomData_get(&dm->vertData, index, type);
}
void *DM_get_edge_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumEdges(dm));
return CustomData_get(&dm->edgeData, index, type);
}
void *DM_get_tessface_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumTessFaces(dm));
return CustomData_get(&dm->faceData, index, type);
}
void *DM_get_poly_data(DerivedMesh *dm, int index, int type)
{
+ BLI_assert(index >= 0 && index < dm->getNumPolys(dm));
return CustomData_get(&dm->polyData, index, type);
}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c 2013-07-12 00:29:06 UTC (rev 58186)
@@ -2073,6 +2073,8 @@
int offset;
int layer_index;
+ BLI_assert(index >= 0);
+
/* get the layer index of the active layer of type */
layer_index = CustomData_get_active_layer_index(data, type);
if (layer_index < 0) return NULL;
@@ -2088,6 +2090,8 @@
int layer_index;
int offset;
+ BLI_assert(index >= 0 && n >= 0);
+
/* get the layer index of the first layer of type */
layer_index = data->typemap[type];
if (layer_index < 0) return NULL;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mball.c 2013-07-12 00:29:06 UTC (rev 58186)
@@ -1646,6 +1646,14 @@
v[2] = z;
}
+/* TODO(sergey): Perhaps it could be general utility function in mathutils. */
+static bool has_zero_axis_m4(float matrix[4][4])
+{
+ return len_squared_v3(matrix[0]) < FLT_EPSILON ||
+ len_squared_v3(matrix[1]) < FLT_EPSILON ||
+ len_squared_v3(matrix[2]) < FLT_EPSILON;
+}
+
static float init_meta(PROCESS *process, Scene *scene, Object *ob) /* return totsize */
{
Scene *sce_iter = scene;
@@ -1694,13 +1702,13 @@
/* when metaball object has zero scale, then MetaElem to this MetaBall
* will not be put to mainb array */
- if (bob->size[0] == 0.0f || bob->size[1] == 0.0f || bob->size[2] == 0.0f) {
+ if (has_zero_axis_m4(bob->obmat)) {
zero_size = 1;
}
else if (bob->parent) {
struct Object *pob = bob->parent;
while (pob) {
- if (pob->size[0] == 0.0f || pob->size[1] == 0.0f || pob->size[2] == 0.0f) {
+ if (has_zero_axis_m4(pob->obmat)) {
zero_size = 1;
break;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c 2013-07-12 00:18:27 UTC (rev 58185)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/particle.c 2013-07-12 00:29:06 UTC (rev 58186)
@@ -3414,8 +3414,7 @@
OrigSpaceFace *osface;
float (*orcodata)[3];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list