[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57908] branches/soc-2013-dingto: Merged revision(s) 57828-57907 from trunk/blender into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Mon Jul 1 17:23:48 CEST 2013
Revision: 57908
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57908
Author: dingto
Date: 2013-07-01 15:23:48 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Merged revision(s) 57828-57907 from trunk/blender into soc-2013-dingto
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.h
branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-dingto/intern/cycles/render/background.cpp
branches/soc-2013-dingto/intern/cycles/render/background.h
branches/soc-2013-dingto/intern/cycles/render/osl.cpp
branches/soc-2013-dingto/intern/cycles/render/scene.h
branches/soc-2013-dingto/intern/cycles/render/shader.cpp
branches/soc-2013-dingto/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-dingto/release/scripts/startup/bl_operators/node.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-dingto/source/blender/blenfont/SConscript
branches/soc-2013-dingto/source/blender/blenfont/intern/blf.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_dir.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-dingto/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/library.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mball.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-dingto/source/blender/blenlib/intern/path_util.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.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/compositor/nodes/COM_MixNode.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixBaseOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixBaseOperation.h
branches/soc-2013-dingto/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-dingto/source/blender/editors/animation/keyframing.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_relations.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-dingto/source/blender/editors/armature/meshlaplacian.c
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.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/mesh_navmesh.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_hook.c
branches/soc-2013-dingto/source/blender/editors/object/object_intern.h
branches/soc-2013-dingto/source/blender/editors/object/object_lattice.c
branches/soc-2013-dingto/source/blender/editors/object/object_ops.c
branches/soc-2013-dingto/source/blender/editors/object/object_relations.c
branches/soc-2013-dingto/source/blender/editors/object/object_shapekey.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/screen/screen_edit.c
branches/soc-2013-dingto/source/blender/editors/screen/screen_ops.c
branches/soc-2013-dingto/source/blender/editors/screen/screendump.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-dingto/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-dingto/source/blender/editors/space_image/image_ops.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_intern.h
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_ops.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-dingto/source/blender/editors/space_script/script_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-dingto/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2013-dingto/source/blender/render/intern/source/convertblender.c
branches/soc-2013-dingto/source/blender/render/intern/source/shadeoutput.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-dingto/source/creator/creator.c
branches/soc-2013-dingto/source/tests/bl_run_operators.py
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/space_outliner/
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-57827
+ /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-57907
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-07-01 15:23:48 UTC (rev 57908)
@@ -1142,6 +1142,9 @@
fi
_with_built_openexr=true
+
+ # Just always run it, much simpler this way!
+ _need_openexr_ldconfig=true
}
#### Build OIIO ####
@@ -3135,6 +3138,9 @@
if [ $_need_oiio_ldconfig == true ]; then
sudo sh -c "echo \"$INST/oiio/lib\" > /etc/ld.so.conf.d/oiio.conf"
fi
+if [ $_need_openexr_ldconfig == true ]; then
+ sudo sh -c "echo \"$INST/openexr/lib\" > /etc/ld.so.conf.d/openexr.conf"
+fi
sudo /sbin/ldconfig # XXX OpenSuse does not include sbin in command path with sudo!!!
INFO ""
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.cpp 2013-07-01 15:23:48 UTC (rev 57908)
@@ -104,9 +104,10 @@
{
}
-void OSLRenderServices::thread_init(KernelGlobals *kernel_globals_)
+void OSLRenderServices::thread_init(KernelGlobals *kernel_globals_, OSL::TextureSystem *osl_ts_)
{
kernel_globals = kernel_globals_;
+ osl_ts = osl_ts_;
}
bool OSLRenderServices::get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time)
@@ -767,7 +768,7 @@
float s, float t, float dsdx, float dtdx,
float dsdy, float dtdy, float *result)
{
- OSL::TextureSystem *ts = kernel_globals->osl->ts;
+ OSL::TextureSystem *ts = osl_ts;
bool status = ts->texture(filename, options, s, t, dsdx, dtdx, dsdy, dtdy, result);
if(!status) {
@@ -789,7 +790,7 @@
const OSL::Vec3 &dPdx, const OSL::Vec3 &dPdy,
const OSL::Vec3 &dPdz, float *result)
{
- OSL::TextureSystem *ts = kernel_globals->osl->ts;
+ OSL::TextureSystem *ts = osl_ts;
bool status = ts->texture3d(filename, options, P, dPdx, dPdy, dPdz, result);
if(!status) {
@@ -811,7 +812,7 @@
OSL::ShaderGlobals *sg, const OSL::Vec3 &R,
const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, float *result)
{
- OSL::TextureSystem *ts = kernel_globals->osl->ts;
+ OSL::TextureSystem *ts = osl_ts;
bool status = ts->environment(filename, options, R, dRdx, dRdy, result);
if(!status) {
@@ -832,7 +833,7 @@
ustring dataname,
TypeDesc datatype, void *data)
{
- OSL::TextureSystem *ts = kernel_globals->osl->ts;
+ OSL::TextureSystem *ts = osl_ts;
return ts->get_texture_info(filename, subimage, dataname, datatype, data);
}
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.h 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_services.h 2013-07-01 15:23:48 UTC (rev 57908)
@@ -45,7 +45,7 @@
OSLRenderServices();
~OSLRenderServices();
- void thread_init(KernelGlobals *kernel_globals);
+ void thread_init(KernelGlobals *kernel_globals, OSL::TextureSystem *ts);
bool get_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time);
bool get_inverse_matrix(OSL::Matrix44 &result, OSL::TransformationPtr xform, float time);
@@ -148,6 +148,7 @@
private:
KernelGlobals *kernel_globals;
+ OSL::TextureSystem *osl_ts;
};
CCL_NAMESPACE_END
Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_shader.cpp 2013-07-01 15:23:48 UTC (rev 57908)
@@ -47,7 +47,7 @@
/* per thread kernel data init*/
kg->osl = osl_globals;
- kg->osl->services->thread_init(kernel_globals);
+ kg->osl->services->thread_init(kernel_globals, osl_globals->ts);
OSL::ShadingSystem *ss = kg->osl->ss;
OSLThreadData *tdata = new OSLThreadData();
Modified: branches/soc-2013-dingto/intern/cycles/render/background.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/background.cpp 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/render/background.cpp 2013-07-01 15:23:48 UTC (rev 57908)
@@ -38,6 +38,7 @@
use = true;
visibility = ~0;
+ shader = 0;
transparent = false;
need_update = true;
@@ -54,6 +55,11 @@
device_free(device, dscene);
+ if(use)
+ shader = scene->default_background;
+ else
+ shader = scene->default_empty;
+
/* set shader index and transparent option */
KernelBackground *kbackground = &dscene->data.background;
@@ -61,10 +67,7 @@
kbackground->ao_distance = ao_distance;
kbackground->transparent = transparent;
- if(use)
- kbackground->shader = scene->shader_manager->get_shader_id(scene->default_background);
- else
- kbackground->shader = scene->shader_manager->get_shader_id(scene->default_empty);
+ kbackground->shader = scene->shader_manager->get_shader_id(shader);
if(!(visibility & PATH_RAY_DIFFUSE))
kbackground->shader |= SHADER_EXCLUDE_DIFFUSE;
Modified: branches/soc-2013-dingto/intern/cycles/render/background.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/background.h 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/render/background.h 2013-07-01 15:23:48 UTC (rev 57908)
@@ -35,6 +35,7 @@
bool use;
uint visibility;
+ uint shader;
bool transparent;
bool need_update;
Modified: branches/soc-2013-dingto/intern/cycles/render/osl.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/osl.cpp 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/render/osl.cpp 2013-07-01 15:23:48 UTC (rev 57908)
@@ -122,6 +122,12 @@
scene->image_manager->set_osl_texture_system((void*)ts);
device_update_common(device, dscene, scene, progress);
+
+ /* greedyjit test
+ {
+ thread_scoped_lock lock(ss_shared_mutex);
+ ss->optimize_all_groups();
+ }*/
}
void OSLShaderManager::device_free(Device *device, DeviceScene *dscene, Scene *scene)
@@ -187,6 +193,7 @@
ss_shared->attribute("lockgeom", 1);
ss_shared->attribute("commonspace", "world");
ss_shared->attribute("searchpath:shader", path_get("shader"));
+ //ss_shared->attribute("greedyjit", 1);
/* our own ray types */
static const char *raytypes[] = {
@@ -714,7 +721,7 @@
current_type = type;
- ss->ShaderGroupBegin();
+ ss->ShaderGroupBegin(shader->name.c_str());
ShaderNode *output = graph->output();
set<ShaderNode*> dependencies;
@@ -777,9 +784,11 @@
if(shader->graph_bump) {
ss->clear_state();
compile_type(shader, shader->graph_bump, SHADER_TYPE_SURFACE);
+ shader->osl_surface_bump_ref = ss->state();
}
+ else
+ shader->osl_surface_bump_ref = shader->osl_surface_ref;
- shader->osl_surface_bump_ref = ss->state();
ss->clear_state();
shader->has_surface = true;
Modified: branches/soc-2013-dingto/intern/cycles/render/scene.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/scene.h 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/render/scene.h 2013-07-01 15:23:48 UTC (rev 57908)
@@ -180,7 +180,6 @@
int default_surface;
int default_light;
int default_background;
- int default_holdout;
int default_empty;
/* device */
Modified: branches/soc-2013-dingto/intern/cycles/render/shader.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/render/shader.cpp 2013-07-01 14:58:59 UTC (rev 57907)
+++ branches/soc-2013-dingto/intern/cycles/render/shader.cpp 2013-07-01 15:23:48 UTC (rev 57908)
@@ -16,6 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "background.h"
#include "bssrdf.h"
#include "blackbody.h"
#include "device.h"
@@ -194,10 +195,10 @@
foreach(Shader *shader, scene->shaders)
shader->used = false;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list