Revision: 59000
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59000
Author: nazgul
Date: 2013-08-07 19:11:37 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
Merging r58956 through r58999 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58956
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58999
Modified Paths:
--------------
branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2011-tomato/intern/cycles/render/blackbody.cpp
branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
branches/soc-2011-tomato/intern/mikktspace/mikktspace.c
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/maya.py
branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/image_gen.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_buffer.h
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/voronoi.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2011-tomato/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-tomato/source/blender/editors/armature/pose_transform.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
branches/soc-2011-tomato/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
branches/soc-2011-tomato/source/blender/render/intern/source/bake.c
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/multires_bake.c
branches/soc-2011-tomato/source/blender/render/intern/source/occlusion.c
branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
branches/soc-2011-tomato/source/blender/render/intern/source/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-58955
+ /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-2013-depsgraph_mt:57516
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835
/branches/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-58999
Modified:
branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
===================================================================
---
branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
2013-08-07 19:02:15 UTC (rev 58999)
+++
branches/soc-2011-tomato/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
2013-08-07 19:11:37 UTC (rev 59000)
@@ -27,6 +27,12 @@
:type: float
+ .. attribute:: fov
+
+ The camera's field of view value.
+
+ :type: float
+
.. attribute:: ortho_scale
The camera's view scale when in orthographic mode.
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
2013-08-07 19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_object.cpp
2013-08-07 19:11:37 UTC (rev 59000)
@@ -348,32 +348,41 @@
bool hair_present = false;
bool show_emitter = false;
- bool hide = false;
+ bool hide_as_dupli_parent = false;
+ bool hide_as_dupli_child_original = false;
for(b_ob.particle_systems.begin(b_psys); b_psys !=
b_ob.particle_systems.end(); ++b_psys) {
if((b_psys->settings().render_type() ==
BL::ParticleSettings::render_type_PATH) &&
(b_psys->settings().type()==BL::ParticleSettings::type_HAIR))
hair_present = true;
- if(b_psys->settings().use_render_emitter()) {
- hide = false;
+ if(b_psys->settings().use_render_emitter())
show_emitter = true;
- }
}
/* duplicators hidden by default, except dupliframes which duplicate
self */
if(b_ob.is_duplicator())
if(top_level || b_ob.dupli_type() !=
BL::Object::dupli_type_FRAMES)
- hide = true;
+ hide_as_dupli_parent = true;
/* hide original object for duplis */
BL::Object parent = b_ob.parent();
if(parent && object_render_hide_original(b_ob.type(),
parent.dupli_type()))
if(parent_hide)
- hide = true;
-
- hide_triangles = (hair_present && !show_emitter);
- return hide && !show_emitter;
+ hide_as_dupli_child_original = true;
+
+ if(show_emitter) {
+ hide_triangles = false;
+ return (hide_as_dupli_parent || hide_as_dupli_child_original);
+ }
+ else if(hair_present) {
+ hide_triangles = true;
+ return hide_as_dupli_child_original;
+ }
+ else {
+ hide_triangles = false;
+ return (hide_as_dupli_parent || hide_as_dupli_child_original);
+ }
}
static bool object_render_hide_duplis(BL::Object b_ob)
Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
2013-08-07 19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
2013-08-07 19:11:37 UTC (rev 59000)
@@ -44,11 +44,11 @@
#define BSSRDF_MIN_RADIUS 1e-8f
#define BSSRDF_MAX_ATTEMPTS 8
-#define BB_DRAPPER 800.0
-#define BB_MAX_TABLE_RANGE 12000.0
-#define BB_TABLE_XPOWER 1.5
-#define BB_TABLE_YPOWER 5.0
-#define BB_TABLE_SPACING 2.0
+#define BB_DRAPPER 800.0f
+#define BB_MAX_TABLE_RANGE 12000.0f
+#define BB_TABLE_XPOWER 1.5f
+#define BB_TABLE_YPOWER 5.0f
+#define BB_TABLE_SPACING 2.0f
#define TEX_NUM_FLOAT_IMAGES 5
Modified: branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_blackbody.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_blackbody.h
2013-08-07 19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_blackbody.h
2013-08-07 19:11:37 UTC (rev 59000)
@@ -53,7 +53,7 @@
/* reconstruct a proper index for the table lookup, compared to
OSL we don't look up two colors
just one (the OSL-lerp is also automatically done for us by
"lookup_table_read") */
- float t = powf((temperature - BB_DRAPPER) * (1.0f /
BB_TABLE_SPACING), 1.0f/BB_TABLE_XPOWER);
+ float t = powf((temperature - BB_DRAPPER) * (1.0f /
BB_TABLE_SPACING), (1.0f / BB_TABLE_XPOWER));
int blackbody_table_offset = kernel_data.blackbody.table_offset;
Modified: branches/soc-2011-tomato/intern/cycles/render/blackbody.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/blackbody.cpp 2013-08-07
19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/cycles/render/blackbody.cpp 2013-08-07
19:11:37 UTC (rev 59000)
@@ -91,7 +91,7 @@
const double c1 = 3.74183e-16; // 2*pi*h*c^2, W*m^2
const double c2 = 1.4388e-2; // h*c/k, m*K
// h is
Planck's const, k is Boltzmann's
- const float dlambda = 5.0f * 1e-9; // in meters
+ const float dlambda = 5.0f * 1e-9f; // in meters
/* Blackbody table from 800 to 12k Kelvin (319 entries (317+2 offset) *
3) */
vector<float> blackbody_table(956);
@@ -100,7 +100,7 @@
/* ToDo: bring this back to what OSL does with the lastTemperature
limit ? */
for (int i = 0; i <= 317; ++i) {
- float Temperature = powf (float(i), BB_TABLE_XPOWER) *
BB_TABLE_SPACING + BB_DRAPPER;
+ double Temperature = pow((double)i, (double)BB_TABLE_XPOWER) *
(double)BB_TABLE_SPACING + (double)BB_DRAPPER;
X = 0;
Y = 0;
Z = 0;
@@ -108,10 +108,10 @@
/* from OSL "spectrum_to_XYZ" */
for (int n = 0; n < 81; ++n) {
float lambda = 380.0f + 5.0f * n;
- double wlm = lambda * 1e-9; // Wavelength in meters
+ double wlm = lambda * 1e-9f; // Wavelength in meters
// N.B. spec_intens returns result in W/m^2 but it's a
differential,
// needs to be scaled by dlambda!
- float spec_intens = float((c1 * powf(wlm,-5.0)) /
(expf(c2 / (wlm * Temperature)) -1.0f));
+ float spec_intens = float((c1 * pow(wlm, -5.0)) /
(exp(c2 / (wlm * Temperature)) -1.0));
float Me = spec_intens * dlambda;
X += Me * cie_colour_match[n][0];
Modified: branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp
===================================================================
--- branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp 2013-08-07
19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/dualcon/intern/octree.cpp 2013-08-07
19:11:37 UTC (rev 59000)
@@ -2182,7 +2182,7 @@
ata[4] += (float)(norm[1] * norm[2]);
ata[5] += (float)(norm[2] * norm[2]);
- double pn = p[0] * norm[0] + p[1] * norm[1] + p[2] *
norm[2];
+ const float pn = p[0] * norm[0] + p[1] * norm[1] + p[2]
* norm[2];
atb[0] += (float)(norm[0] * pn);
atb[1] += (float)(norm[1] * pn);
Modified: branches/soc-2011-tomato/intern/mikktspace/mikktspace.c
===================================================================
--- branches/soc-2011-tomato/intern/mikktspace/mikktspace.c 2013-08-07
19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/intern/mikktspace/mikktspace.c 2013-08-07
19:11:37 UTC (rev 59000)
@@ -426,7 +426,7 @@
int index;
} STmpVert;
-const int g_iCells = 2048;
+static const int g_iCells = 2048;
#ifdef _MSC_VER
#define NOINLINE __declspec(noinline)
Modified:
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
---
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
2013-08-07 19:02:15 UTC (rev 58999)
+++
branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
2013-08-07 19:11:37 UTC (rev 59000)
@@ -72,6 +72,7 @@
"bandnoise",
"bindcode",
"bitrate",
+ "blackbody",
"blendfile",
"blendin",
"bonesize",
@@ -361,6 +362,7 @@
"timecode",
"voronoi",
"voxel", "voxels",
+ "vsync",
"wireframe",
"zmask",
"ztransp",
Modified: branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
2013-08-07 19:02:15 UTC (rev 58999)
+++ branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
2013-08-07 19:11:37 UTC (rev 59000)
@@ -119,6 +119,7 @@
kmi = km.keymap_items.new('marker.move', 'EVT_TWEAK_S', 'ANY')
kmi = km.keymap_items.new('marker.duplicate', 'D', 'PRESS', shift=True)
kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS')
+kmi.properties.extend = False
kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', shift=True)
kmi.properties.extend = True
kmi = km.keymap_items.new('marker.select', 'SELECTMOUSE', 'PRESS', ctrl=True)
@@ -721,6 +722,7 @@
km = kc.keymaps.new('Animation Channels', space_type='EMPTY',
region_type='WINDOW', modal=False)
kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS')
+kmi.properties.extend = False
kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS',
shift=True)
kmi.properties.extend = True
kmi = km.keymap_items.new('anim.channels_click', 'LEFTMOUSE', 'PRESS',
shift=True, ctrl=True)
Modified: branches/soc-2011-tomato/release/scripts/presets/keyconfig/maya.py
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
