[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58226] branches/soc-2013-dingto: Merged revision(s) 58093-58225 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Sun Jul 14 01:52:44 CEST 2013
Revision: 58226
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58226
Author: dingto
Date: 2013-07-13 23:52:43 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
Merged revision(s) 58093-58225 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/kernel/kernel_camera.h
branches/soc-2013-dingto/intern/cycles/render/graph.cpp
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_scene.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/boids.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/brush.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/linestyle.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/material.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mball.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/node.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/scene.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/text.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/unit.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_vector.c
branches/soc-2013-dingto/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-dingto/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
branches/soc-2013-dingto/source/blender/compositor/nodes/COM_ZCombineNode.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
branches/soc-2013-dingto/source/blender/editors/animation/anim_markers.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_relations.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_utils.c
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/include/ED_render.h
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_layout.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_templates.c
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/object/object_add.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/physics/particle_edit.c
branches/soc-2013-dingto/source/blender/editors/render/render_internal.c
branches/soc-2013-dingto/source/blender/editors/render/render_preview.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-dingto/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-dingto/source/blender/editors/space_file/filelist.c
branches/soc-2013-dingto/source/blender/editors/space_node/drawnode.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_select.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-dingto/source/blender/editors/space_time/space_time.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.h
branches/soc-2013-dingto/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-dingto/source/blender/editors/util/undo.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/BoxGrid.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMap.cpp
branches/soc-2013-dingto/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-dingto/source/blender/imbuf/intern/tiff.c
branches/soc-2013-dingto/source/blender/imbuf/intern/util.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-dingto/source/blender/makesdna/intern/makesdna.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-dingto/source/blender/render/extern/include/RE_engine.h
branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
branches/soc-2013-dingto/source/blender/render/intern/source/envmap.c
branches/soc-2013-dingto/source/blender/render/intern/source/external_engine.c
branches/soc-2013-dingto/source/blender/render/intern/source/render_texture.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_playanim.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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:57315-57365,57369-58092
+ /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:57315-57365,57369-58225
Modified: branches/soc-2013-dingto/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2013-dingto/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-07-13 23:52:43 UTC (rev 58226)
@@ -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-dingto/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/__init__.py 2013-07-13 23:52:43 UTC (rev 58226)
@@ -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-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-07-13 23:52:43 UTC (rev 58226)
@@ -211,23 +211,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-dingto/intern/cycles/kernel/kernel_camera.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_camera.h 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_camera.h 2013-07-13 23:52:43 UTC (rev 58226)
@@ -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-dingto/intern/cycles/render/graph.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/graph.cpp 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/intern/cycles/render/graph.cpp 2013-07-13 23:52:43 UTC (rev 58226)
@@ -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-dingto/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenfont/intern/blf_font.c 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/source/blender/blenfont/intern/blf_font.c 2013-07-13 23:52:43 UTC (rev 58226)
@@ -87,7 +87,7 @@
err = FT_Set_Char_Size(font->face, 0, (FT_F26Dot6)(size * 64), dpi, dpi);
if (err) {
/* FIXME: here we can go through the fixed size and choice a close one */
- printf("The current font don't support the size, %d and dpi, %d\n", size, dpi);
+ printf("The current font don't support the size, %u and dpi, %u\n", size, dpi);
return;
}
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-13 23:52:43 UTC (rev 58226)
@@ -323,6 +323,7 @@
/** Get smooth vertex normal, undefined if index is not valid */
void (*getVertNo)(DerivedMesh *dm, int index, float no_r[3]);
+ void (*getPolyNo)(DerivedMesh *dm, int index, float no_r[3]);
/** Get a map of vertices to faces
*/
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_object.h 2013-07-13 23:52:43 UTC (rev 58226)
@@ -95,15 +95,16 @@
void BKE_object_to_mat3(struct Object *ob, float mat[3][3]);
void BKE_object_to_mat4(struct Object *ob, float mat[4][4]);
void BKE_object_apply_mat4(struct Object *ob, float mat[4][4], const bool use_compat, const bool use_parent);
+void BKE_object_matrix_local_get(struct Object *ob, float mat[4][4]);
bool BKE_object_pose_context_check(struct Object *ob);
struct Object *BKE_object_pose_armature_get(struct Object *ob);
void BKE_object_where_is_calc(struct Scene *scene, struct Object *ob);
-void BKE_object_where_is_calc_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob);
+void BKE_object_where_is_calc_ex(struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float r_originmat[3][3]);
void BKE_object_where_is_calc_time(struct Scene *scene, struct Object *ob, float ctime);
void BKE_object_where_is_calc_time_ex(struct Scene *scene, struct Object *ob, float ctime,
- struct RigidBodyWorld *rbw);
+ struct RigidBodyWorld *rbw, float r_originmat[3][3]);
void BKE_object_where_is_calc_simul(struct Scene *scene, struct Object *ob);
void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, float obmat[4][4]);
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_scene.h 2013-07-13 22:55:28 UTC (rev 58225)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_scene.h 2013-07-13 23:52:43 UTC (rev 58226)
@@ -75,8 +75,18 @@
void BKE_scene_base_unlink(struct Scene *sce, struct Base *base);
void BKE_scene_base_deselect_all(struct Scene *sce);
void BKE_scene_base_select(struct Scene *sce, struct Base *selbase);
-int BKE_scene_base_iter_next(struct Scene **scene, int val, struct Base **base, struct Object **ob);
+/* Scene base iteration function.
+ * Define struct here, so no need to bother with alloc/free it.
+ */
+typedef struct SceneBaseIter {
+ struct ListBase *duplilist;
+ struct DupliObject *dupob;
+ int fase;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list