[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57828] branches/soc-2013-dingto: Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
Thomas Dinges
blender at dingto.org
Thu Jun 27 18:16:54 CEST 2013
Revision: 57828
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57828
Author: dingto
Date: 2013-06-27 16:16:54 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Merged revision(s) 57768-57827 from trunk/blender into soc-2013-dingto
Modified Paths:
--------------
branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
branches/soc-2013-dingto/doc/python_api/examples/bpy.app.translations.py
branches/soc-2013-dingto/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp
branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_phong_ramp.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-dingto/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2013-dingto/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2013-dingto/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2013-dingto/intern/cycles/util/util_math.h
branches/soc-2013-dingto/intern/cycles/util/util_types.h
branches/soc-2013-dingto/intern/cycles/util/util_vector.h
branches/soc-2013-dingto/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-dingto/intern/locale/boost_locale_wrapper.cpp
branches/soc-2013-dingto/release/datafiles/startup.blend
branches/soc-2013-dingto/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
branches/soc-2013-dingto/release/scripts/modules/bpy/utils.py
branches/soc-2013-dingto/release/scripts/modules/console/complete_namespace.py
branches/soc-2013-dingto/release/scripts/modules/nodeitems_utils.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/node.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/presets.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-dingto/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_userpref.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/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-dingto/release/text/readme.html
branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/effect.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-dingto/source/blender/blenlib/intern/path_util.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-dingto/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/curve/editfont.c
branches/soc-2013-dingto/source/blender/editors/curve/lorem.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/interface/interface_widgets.c
branches/soc-2013-dingto/source/blender/editors/interface/resources.c
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/mesh_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.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/screendump.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2013-dingto/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-dingto/source/blender/render/intern/source/envmap.c
branches/soc-2013-dingto/source/blender/render/intern/source/pipeline.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-dingto/source/gameengine/Ketsji/BL_Shader.cpp
Added Paths:
-----------
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex_proj.c
Property Changed:
----------------
branches/soc-2013-dingto/
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-57767
+ /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
Modified: branches/soc-2013-dingto/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/build_files/build_environment/install_deps.sh 2013-06-27 16:16:54 UTC (rev 57828)
@@ -1527,7 +1527,7 @@
compile_OSL() {
# To be changed each time we make edits that would modify the compiled result!
- osl_magic=9
+ osl_magic=10
_init_osl
# Clean install if needed!
Modified: branches/soc-2013-dingto/doc/python_api/examples/bpy.app.translations.py
===================================================================
--- branches/soc-2013-dingto/doc/python_api/examples/bpy.app.translations.py 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/doc/python_api/examples/bpy.app.translations.py 2013-06-27 16:16:54 UTC (rev 57828)
@@ -4,7 +4,7 @@
.. warning::
Most of this object should only be useful if you actually manipulate i18n stuff from Python.
- If you are a regular addon, you should only bother about :const:`contexts` member,
+ If you are a regular addon, you should only bother about :const:`contexts` member,
and the :func:`register`/:func:`unregister` functions! The :func:`pgettext` family of functions
should only be used in rare, specific cases (like e.g. complex "composited" UI strings...).
Modified: branches/soc-2013-dingto/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py
===================================================================
--- branches/soc-2013-dingto/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py 2013-06-27 16:16:54 UTC (rev 57828)
@@ -8,6 +8,7 @@
import bpy
+
def draw(self, context):
self.layout.label("Hello World")
Modified: branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-06-27 16:16:54 UTC (rev 57828)
@@ -769,6 +769,7 @@
row.prop(light, "ao_factor", text="Factor")
row.prop(light, "distance", text="Distance")
+
class CyclesWorld_PT_mist(CyclesButtonsPanel, Panel):
bl_label = "Mist Pass"
bl_context = "world"
@@ -935,7 +936,7 @@
col = split.column(align=True)
col.label()
col.prop(mat, "pass_index")
-
+
col = layout.column()
col.prop(cmat, "sample_as_light")
col.prop(cmat, "use_transparent_shadow")
@@ -1161,7 +1162,7 @@
row = layout.row()
row.prop(ccscene, "use_parents", text="Include parents")
-
+
row = layout.row()
row.prop(ccscene, "minimum_width", text="Min Pixels")
row.prop(ccscene, "maximum_width", text="Max Ext.")
@@ -1193,7 +1194,7 @@
row = layout.row()
row.prop(cpsys, "root_width", text="Root")
row.prop(cpsys, "tip_width", text="Tip")
-
+
row = layout.row()
row.prop(cpsys, "radius_scale", text="Scaling")
row.prop(cpsys, "use_closetip", text="Close tip")
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_curves.cpp 2013-06-27 16:16:54 UTC (rev 57828)
@@ -183,7 +183,7 @@
int mi = clamp(b_psys.settings().material()-1, 0, mesh->used_shaders.size()-1);
int shader = mesh->used_shaders[mi];
int draw_step = background ? b_psys.settings().render_step() : b_psys.settings().draw_step();
- int ren_step = (int)pow((float)2.0f,(float)draw_step);
+ int ren_step = (int)powf(2.0f, (float)draw_step);
int totparts = b_psys.particles.length();
int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_psys.settings().draw_percentage() / 100.0f);
int totcurves = totchild;
Modified: branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/device/device_cuda.cpp 2013-06-27 16:16:54 UTC (rev 57828)
@@ -607,13 +607,8 @@
cuda_assert(cuParamSetSize(cuPathTrace, offset))
/* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
int xthreads = 16;
int ythreads = 16;
-#else
- int xthreads = 8;
- int ythreads = 8;
-#endif
int xblocks = (rtile.w + xthreads - 1)/xthreads;
int yblocks = (rtile.h + ythreads - 1)/ythreads;
@@ -676,13 +671,8 @@
cuda_assert(cuParamSetSize(cuFilmConvert, offset))
/* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
int xthreads = 16;
int ythreads = 16;
-#else
- int xthreads = 8;
- int ythreads = 8;
-#endif
int xblocks = (task.w + xthreads - 1)/xthreads;
int yblocks = (task.h + ythreads - 1)/ythreads;
@@ -730,11 +720,7 @@
cuda_assert(cuParamSetSize(cuDisplace, offset))
/* launch kernel: todo find optimal size, cache config for fermi */
-#ifndef __APPLE__
int xthreads = 16;
-#else
- int xthreads = 8;
-#endif
int xblocks = (task.shader_w + xthreads - 1)/xthreads;
cuda_assert(cuFuncSetCacheConfig(cuDisplace, CU_FUNC_CACHE_PREFER_L1))
Modified: branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/device/device_opencl.cpp 2013-06-27 16:16:54 UTC (rev 57828)
@@ -241,6 +241,9 @@
{
cl_context context = get_something<cl_context>(platform, device, &Slot::context, slot_locker);
+ if(!context)
+ return NULL;
+
/* caller is going to release it when done with it, so retain it */
cl_int ciErr = clRetainContext(context);
assert(ciErr == CL_SUCCESS);
@@ -255,6 +258,9 @@
{
cl_program program = get_something<cl_program>(platform, device, &Slot::program, slot_locker);
+ if(!program)
+ return NULL;
+
/* caller is going to release it when done with it, so retain it */
cl_int ciErr = clRetainProgram(program);
assert(ciErr == CL_SUCCESS);
Modified: branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h 2013-06-27 16:16:54 UTC (rev 57828)
@@ -41,6 +41,8 @@
float npos = pos * (float)(MAXCOLORS - 1);
int ipos = float_to_int(npos);
+ if (ipos < 0)
+ return colors[0];
if (ipos >= (MAXCOLORS - 1))
return colors[MAXCOLORS - 1];
float offset = npos - (float)ipos;
Modified: branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_phong_ramp.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_phong_ramp.h 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_phong_ramp.h 2013-06-27 16:16:54 UTC (rev 57828)
@@ -41,6 +41,8 @@
float npos = pos * (float)(MAXCOLORS - 1);
int ipos = float_to_int(npos);
+ if (ipos < 0)
+ return colors[0];
if (ipos >= (MAXCOLORS - 1))
return colors[MAXCOLORS - 1];
float offset = npos - (float)ipos;
@@ -49,6 +51,8 @@
__device int bsdf_phong_ramp_setup(ShaderClosure *sc)
{
+ sc->data0 = max(sc->data0, 0.0f);
+
sc->type = CLOSURE_BSDF_PHONG_RAMP_ID;
return SD_BSDF | SD_BSDF_HAS_EVAL | SD_BSDF_GLOSSY;
}
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_opencl.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_opencl.h 2013-06-27 16:08:06 UTC (rev 57827)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_compat_opencl.h 2013-06-27 16:16:54 UTC (rev 57828)
@@ -108,7 +108,6 @@
/* data lookup defines */
#define kernel_data (*kg->data)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list