[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57355] branches/soc-2011-tomato: Merging r57346 through r57354 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 10 16:28:34 CEST 2013
Revision: 57355
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57355
Author: nazgul
Date: 2013-06-10 14:28:34 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
Merging r57346 through r57354 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57346
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57354
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-tomato/source/blender/python/intern/bpy_interface.c
branches/soc-2011-tomato/source/blender/render/extern/include/RE_engine.h
branches/soc-2011-tomato/source/blender/render/intern/source/external_engine.c
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_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/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-57345
+ /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/vgroup_modifiers:38694-39989
/tags/blender-2.67b-release/blender:57122
/trunk/blender:36831-57354
Modified: branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py 2013-06-10 14:28:34 UTC (rev 57355)
@@ -40,6 +40,7 @@
bl_label = "Cycles Render"
bl_use_shading_nodes = True
bl_use_preview = True
+ bl_use_exclude_layers = True
def __init__(self):
self.session = None
Modified: branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp 2013-06-10 14:28:34 UTC (rev 57355)
@@ -705,10 +705,13 @@
graph->add(proxy);
}
}
- else if (b_node->is_a(&RNA_ShaderNodeGroup)) {
+ else if (b_node->is_a(&RNA_ShaderNodeGroup) || b_node->is_a(&RNA_NodeCustomGroup)) {
- BL::NodeGroup b_gnode(*b_node);
- BL::ShaderNodeTree b_group_ntree(b_gnode.node_tree());
+ BL::ShaderNodeTree b_group_ntree(PointerRNA_NULL);
+ if (b_node->is_a(&RNA_ShaderNodeGroup))
+ b_group_ntree = BL::ShaderNodeTree(((BL::NodeGroup)(*b_node)).node_tree());
+ else
+ b_group_ntree = BL::ShaderNodeTree(((BL::NodeCustomGroup)(*b_node)).node_tree());
ProxyMap group_proxy_input_map, group_proxy_output_map;
/* Add a proxy node for each socket
Modified: branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h 2013-06-10 14:28:34 UTC (rev 57355)
@@ -465,6 +465,13 @@
closure color ambient_occlusion() BUILTIN;
closure color bssrdf_cubic(normal N, vector radius) BUILTIN;
+// Backwards compatibility
+
+closure color specular_toon(normal N, float size, float smooth)
+{
+ return glossy_toon(N, size, smooth);
+}
+
// Renderer state
int raytype (string typename) BUILTIN;
// the individual 'isFOOray' functions are deprecated
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2013-06-10 14:28:34 UTC (rev 57355)
@@ -122,7 +122,7 @@
void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const int do_newframe);
void BKE_mask_evaluate(struct Mask *mask, const float ctime, const int do_newframe);
void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const int do_newframe);
-void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene, const int do_newframe);
+void BKE_mask_update_scene(struct Main *bmain, struct Scene *scene);
void BKE_mask_parent_init(struct MaskParent *parent);
void BKE_mask_calc_handle_adjacent_interp(struct MaskSpline *spline, struct MaskSplinePoint *point, const float u);
void BKE_mask_calc_tangent_polyline(struct MaskSpline *spline, struct MaskSplinePoint *point, float t[2]);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -484,6 +484,8 @@
Mesh tmp = *me;
int totvert, totedge /*, totface */ /* UNUSED */, totloop, totpoly;
int did_shapekeys = 0;
+ float *texloc, *texrot, *texsize;
+ short *texflag;
CustomData_reset(&tmp.vdata);
CustomData_reset(&tmp.edata);
@@ -529,6 +531,14 @@
shapekey_layers_to_keyblocks(dm, me, uid);
did_shapekeys = 1;
}
+
+ /* copy texture space */
+ if (BKE_object_obdata_texspace_get(ob, &texflag, &texloc, &texsize, &texrot)) {
+ tmp.texflag = *texflag;
+ copy_v3_v3(tmp.loc, texloc);
+ copy_v3_v3(tmp.size, texsize);
+ copy_v3_v3(tmp.rot, texrot);
+ }
/* not all DerivedMeshes store their verts/edges/faces in CustomData, so
* we set them here in case they are missing */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -268,9 +268,9 @@
memset(result, 0, sizeof(bContextDataResult));
#ifdef WITH_PYTHON
if (CTX_py_dict_get(C)) {
- return BPY_context_member_get(C, member, result);
-// if (BPY_context_member_get(C, member, result))
-// return 1;
+ if (BPY_context_member_get(C, member, result)) {
+ return 1;
+ }
}
#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -1548,13 +1548,14 @@
}
}
-void BKE_mask_update_scene(Main *bmain, Scene *scene, const int do_newframe)
+void BKE_mask_update_scene(Main *bmain, Scene *scene)
{
Mask *mask;
for (mask = bmain->mask.first; mask; mask = mask->id.next) {
- if (mask->id.flag & LIB_ID_RECALC) {
- BKE_mask_evaluate_all_masks(bmain, CFRA, do_newframe);
+ if (mask->id.flag & (LIB_ID_RECALC | LIB_ID_RECALC_DATA)) {
+ bool do_new_frame = (mask->id.flag & LIB_ID_RECALC_DATA) != 0;
+ BKE_mask_evaluate_all_masks(bmain, CFRA, do_new_frame);
}
}
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -1181,7 +1181,7 @@
sound_update_scene(scene);
/* update masking curves */
- BKE_mask_update_scene(bmain, scene, FALSE);
+ BKE_mask_update_scene(bmain, scene);
}
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-57345
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-57354
Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_shapekey.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -128,7 +128,7 @@
BKE_mask_evaluate(mask, CFRA, TRUE);
WM_event_add_notifier(C, NC_MASK | ND_DATA, mask);
- DAG_id_tag_update(&mask->id, 0);
+ DAG_id_tag_update(&mask->id, OB_RECALC_DATA);
return OPERATOR_FINISHED;
}
Modified: branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2013-06-10 14:04:03 UTC (rev 57354)
+++ branches/soc-2011-tomato/source/blender/editors/render/render_internal.c 2013-06-10 14:28:34 UTC (rev 57355)
@@ -422,7 +422,7 @@
free_main(rj->main);
/* else the frame will not update for the original value */
- if (!(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
+ if (rj->anim && !(rj->scene->r.scemode & R_NO_FRAME_UPDATE)) {
/* possible this fails of loading new file while rendering */
if (G.main->wm.first) {
ED_update_for_newframe(G.main, rj->scene, 1);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list