[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60292] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Sep 21 10:50:19 CEST 2013
Revision: 60292
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60292
Author: gdh
Date: 2013-09-21 08:50:19 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
Merged trunk into branch. Includes r60239 to r60291.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60239
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60291
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h
branches/soc-2013-cycles_mblur/intern/ghost/SConscript
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_text.py
branches/soc-2013-cycles_mblur/release/text/readme.html
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_customdata.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/CCGSubSurf.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_convexhull2d.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2013-cycles_mblur/source/blender/collada/MeshImporter.cpp
branches/soc-2013-cycles_mblur/source/blender/compositor/COM_compositor.h
branches/soc-2013-cycles_mblur/source/blender/compositor/COM_defines.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_lattice.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_bake.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_info/textview.h
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/space_text.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-cycles_mblur/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-cycles_mblur/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_access.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/RNA_define.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_action.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_animation.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_boid.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_key.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_linestyle.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_material.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh_utils.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nla.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_particle.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_rigidbody.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_screen.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_test.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_meshcache_util.h
branches/soc-2013-cycles_mblur/source/blender/nodes/NOD_common.h
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2013-cycles_mblur/source/blender/python/generic/blf_py_api.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_intern_string.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna_anim.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna_callback.h
branches/soc-2013-cycles_mblur/source/blender/python/intern/gpu.h
branches/soc-2013-cycles_mblur/source/blender/render/intern/source/bake.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/tools/check_style_c.py
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,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60238
+ /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,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-60291
Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh 2013-09-21 08:50:19 UTC (rev 60292)
@@ -550,10 +550,10 @@
# ldconfig
run_ldconfig() {
_lib_path="$INST/$1/lib"
- _ldonf_path="/etc/ld.so.conf.d/$1.conf"
+ _ldconf_path="/etc/ld.so.conf.d/$1.conf"
INFO ""
INFO "Running ldconfig for $1..."
- sudo sh -c "echo \"$INST/boost/lib\" > /etc/ld.so.conf.d/boost.conf"
+ sudo sh -c "echo \"$_lib_path\" > $_ldconf_path"
sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
INFO ""
}
Modified: branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/build_files/cmake/macros.cmake 2013-09-21 08:50:19 UTC (rev 60292)
@@ -774,6 +774,9 @@
COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
DEPENDS ${file_from} datatoc)
+
+ set_source_files_properties(${file_to} PROPERTIES GENERATED TRUE)
+
unset(_file_to_path)
endmacro()
@@ -797,10 +800,11 @@
COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
DEPENDS ${_file_from} datatoc)
+ set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
+
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
-
endmacro()
# XXX Not used for now...
Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_curves.cpp 2013-09-21 08:50:19 UTC (rev 60292)
@@ -217,8 +217,8 @@
float3 pcKey;
for(int step_no = 0; step_no <= ren_step; step_no++) {
float nco[3];
- b_psys.co_hair(*b_ob, psmd, pa_no, step_no, nco);
- float3 cKey = make_float3(nco[0],nco[1],nco[2]);
+ b_psys.co_hair(*b_ob, pa_no, step_no, nco);
+ float3 cKey = make_float3(nco[0], nco[1], nco[2]);
cKey = transform_point(&itfm, cKey);
if(step_no > 0)
curve_length += len(cKey - pcKey);
Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/closure/bsdf_hair.h 2013-09-21 08:50:19 UTC (rev 60292)
@@ -47,16 +47,16 @@
__device int bsdf_hair_reflection_setup(ShaderClosure *sc)
{
sc->type = CLOSURE_BSDF_HAIR_REFLECTION_ID;
- sc->data0 = clamp(sc->data0, 0.001f,1.0f);
- sc->data1 = clamp(sc->data1, 0.001f,1.0f);
+ sc->data0 = clamp(sc->data0, 0.001f, 1.0f);
+ sc->data1 = clamp(sc->data1, 0.001f, 1.0f);
return SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_GLOSSY;
}
__device int bsdf_hair_transmission_setup(ShaderClosure *sc)
{
sc->type = CLOSURE_BSDF_HAIR_TRANSMISSION_ID;
- sc->data0 = clamp(sc->data0, 0.001f,1.0f);
- sc->data1 = clamp(sc->data1, 0.001f,1.0f);
+ sc->data0 = clamp(sc->data0, 0.001f, 1.0f);
+ sc->data1 = clamp(sc->data1, 0.001f, 1.0f);
return SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_GLOSSY;
}
@@ -67,7 +67,7 @@
float3 Tg = sc->T;
#else
float offset = 0.0f;
- float3 Tg = make_float3(1.0f,0.0f,0.0f);
+ float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
#endif
float roughness1 = sc->data0;
float roughness2 = sc->data1;
@@ -124,7 +124,7 @@
float3 Tg = sc->T;
#else
float offset = 0.0f;
- float3 Tg = make_float3(1.0f,0.0f,0.0f);
+ float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
#endif
float roughness1 = sc->data0;
float roughness2 = sc->data1;
@@ -170,7 +170,7 @@
float3 Tg = sc->T;
#else
float offset = 0.0f;
- float3 Tg = make_float3(1.0f,0.0f,0.0f);
+ float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
#endif
float roughness1 = sc->data0;
float roughness2 = sc->data1;
@@ -225,7 +225,7 @@
float3 Tg = sc->T;
#else
float offset = 0.0f;
- float3 Tg = make_float3(1.0f,0.0f,0.0f);
+ float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
#endif
float roughness1 = sc->data0;
float roughness2 = sc->data1;
Modified: branches/soc-2013-cycles_mblur/intern/ghost/SConscript
===================================================================
--- branches/soc-2013-cycles_mblur/intern/ghost/SConscript 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/intern/ghost/SConscript 2013-09-21 08:50:19 UTC (rev 60292)
@@ -157,8 +157,9 @@
elif env['WITH_GHOST_COCOA']: # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
- env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
+ if env['WITH_BF_3DMOUSE']:
+ env.BlenderLib ('bf_intern_ghostndof3dconnexion', sources2, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
else:
env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] )
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_info.py 2013-09-21 08:50:19 UTC (rev 60292)
@@ -394,7 +394,7 @@
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url = "http://wiki.blender.org/index.php/Doc:2.6/Manual"
- layout.operator("wm.url_open", text="Release Log", icon='URL').url = "http://www.blender.org/development/release-logs/blender-268"
+ layout.operator("wm.url_open", text="Release Log", icon='URL').url = "http://www.blender.org/development/release-logs/blender-269"
layout.separator()
layout.operator("wm.url_open", text="Blender Website", icon='URL').url = "http://www.blender.org"
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_text.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_text.py 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_text.py 2013-09-21 08:50:19 UTC (rev 60292)
@@ -301,7 +301,7 @@
layout.separator()
layout.operator("text.jump")
- layout.operator("text.properties", text="Find...")
+ layout.operator("text.start_find", text="Find...")
layout.operator("text.autocomplete")
layout.separator()
Modified: branches/soc-2013-cycles_mblur/release/text/readme.html
===================================================================
--- branches/soc-2013-cycles_mblur/release/text/readme.html 2013-09-21 07:37:11 UTC (rev 60291)
+++ branches/soc-2013-cycles_mblur/release/text/readme.html 2013-09-21 08:50:19 UTC (rev 60292)
@@ -12,18 +12,18 @@
</style>
</head>
<body>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list