[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60106] branches/soc-2013-depsgraph_mt: Merging r60069 through r60105 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Fri Sep 13 15:25:55 CEST 2013
Revision: 60106
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60106
Author: nazgul
Date: 2013-09-13 13:25:55 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Merging r60069 through r60105 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60069
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60105
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_action.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_node.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/action.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/node.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-depsgraph_mt/source/blender/editors/armature/pose_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/include/ED_armature.h
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_node/space_node.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-depsgraph_mt/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna.c
branches/soc-2013-depsgraph_mt/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-depsgraph_mt/source/blender/render/intern/source/pipeline.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-depsgraph_mt/source/tools/CTS/FBlender.py
branches/soc-2013-depsgraph_mt/source/tools/CTS/README.txt
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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-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:57395-60068
+ /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-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:57395-60105
Modified: branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi_stub.cc
===================================================================
--- branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi_stub.cc 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/extern/libmv/libmv-capi_stub.cc 2013-09-13 13:25:55 UTC (rev 60106)
@@ -280,7 +280,7 @@
void libmv_homography2DFromCorrespondencesLinear(double (* /* x1 */)[2], double (* /* x2 */)[2], int /* num_points */,
double H[3][3], double /* expected_precision */)
{
- memset(H, 0, sizeof(H));
+ memset(H, 0, sizeof(double[3][3]));
H[0][0] = 1.0f;
H[1][1] = 1.0f;
H[2][2] = 1.0f;
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/addon/ui.py 2013-09-13 13:25:55 UTC (rev 60106)
@@ -830,12 +830,13 @@
def draw(self, context):
layout = self.layout
+
light = context.world.light_settings
- layout.active = light.use_ambient_occlusion
-
row = layout.row()
- row.prop(light, "ao_factor", text="Factor")
+ sub = row.row()
+ sub.active = light.use_ambient_occlusion
+ sub.prop(light, "ao_factor", text="Factor")
row.prop(light, "distance", text="Distance")
Modified: branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/object_utils.py 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/release/scripts/modules/bpy_extras/object_utils.py 2013-09-13 13:25:55 UTC (rev 60106)
@@ -170,6 +170,8 @@
bpy.ops.object.join() # join into the active.
bpy.data.meshes.remove(obdata)
+ # base is freed, set to active object
+ base = scene.object_bases.active
bpy.ops.object.mode_set(mode='EDIT')
else:
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/add_mesh_torus.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/add_mesh_torus.py 2013-09-13 13:25:55 UTC (rev 60106)
@@ -106,9 +106,9 @@
)
mode = bpy.props.EnumProperty(
name="Torus Dimensions",
- items=(("MAJOR_MINOR", "Major/Minor",
+ items=(("MAJOR_MINOR", "Major/Minor",
"Use the major/minor radii for torus dimensions"),
- ("EXT_INT", "Exterior/Interior",
+ ("EXT_INT", "Exterior/Interior",
"Use the exterior/interior radii for torus dimensions")),
update=mode_update_callback,
)
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d.py 2013-09-13 13:25:55 UTC (rev 60106)
@@ -2592,19 +2592,6 @@
subsub.active = scene.unit_settings.system == 'NONE'
subsub.prop(view, "grid_subdivisions", text="Subdivisions")
- if not scene.render.use_shading_nodes:
- col = layout.column()
- col.label(text="Shading:")
- col.prop(gs, "material_mode", text="")
- col.prop(view, "show_textured_solid")
- if view.viewport_shade == 'SOLID':
- col.prop(view, "use_matcap")
- if view.use_matcap:
- col.template_icon_view(view, "matcap_icon")
- col.prop(view, "show_backface_culling")
- if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
- col.prop(view, "show_occlude_wire")
-
layout.separator()
region = view.region_quadview
@@ -2622,6 +2609,39 @@
row.prop(region, "use_box_clip")
+class VIEW3D_PT_view3d_shading(Panel):
+ bl_space_type = 'VIEW_3D'
+ bl_region_type = 'UI'
+ bl_label = "Shading"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ @classmethod
+ def poll(cls, context):
+ view = context.space_data
+ return (view)
+
+ def draw(self, context):
+ layout = self.layout
+
+ view = context.space_data
+ scene = context.scene
+ gs = scene.game_settings
+ obj = context.object
+
+ col = layout.column()
+
+ if not scene.render.use_shading_nodes:
+ col.prop(gs, "material_mode", text="")
+ col.prop(view, "show_textured_solid")
+ if view.viewport_shade == 'SOLID':
+ col.prop(view, "use_matcap")
+ if view.use_matcap:
+ col.template_icon_view(view, "matcap_icon")
+ col.prop(view, "show_backface_culling")
+ if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
+ col.prop(view, "show_occlude_wire")
+
+
class VIEW3D_PT_view3d_motion_tracking(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'UI'
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-09-13 13:25:55 UTC (rev 60106)
@@ -913,7 +913,7 @@
row.prop(brush, "use_relative_jitter", text="", icon='UNLOCKED')
row.prop(brush, "jitter_absolute")
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
-
+
if brush.sculpt_capabilities.has_smooth_stroke:
col = layout.column()
col.separator()
@@ -945,11 +945,10 @@
sub.active = brush.use_smooth_stroke
sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
-
+
layout.prop(settings, "input_samples")
-
class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
bl_label = "Curve"
bl_options = {'DEFAULT_CLOSED'}
@@ -1217,7 +1216,7 @@
row = layout.row()
row.prop(ipaint, "use_normal_falloff")
-
+
sub = row.row()
sub.active = (ipaint.use_normal_falloff)
sub.prop(ipaint, "normal_angle", text="")
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_action.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_action.h 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_action.h 2013-09-13 13:25:55 UTC (rev 60106)
@@ -203,6 +203,9 @@
/* initialize a bItasc structure with default value */
void BKE_pose_itasc_init(struct bItasc *itasc);
+/* Checks if a bone is part of an IK chain or not */
+bool BKE_pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan);
+
/* clears BONE_UNKEYED flags for frame changing */
// XXX to be deprecated for a more general solution in animsys...
void framechange_poses_clear_unkeyed(void);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_node.h 2013-09-13 13:22:18 UTC (rev 60105)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_node.h 2013-09-13 13:25:55 UTC (rev 60106)
@@ -337,7 +337,7 @@
#define NODE_TREE_TYPES_END \
} \
BLI_ghashIterator_free(__node_tree_type_iter__); \
-}
+} (void)0
void ntreeSetTypes(const struct bContext *C, struct bNodeTree *ntree);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list