[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57778] branches/soc-2013-paint: merge with trunk -r 57777

Antony Riakiotakis kalast at gmail.com
Wed Jun 26 17:19:12 CEST 2013


Revision: 57778
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57778
Author:   psy-fi
Date:     2013-06-26 15:19:11 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
merge with trunk -r 57777

Modified Paths:
--------------
    branches/soc-2013-paint/build_files/build_environment/install_deps.sh
    branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
    branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-paint/intern/cycles/render/session.cpp
    branches/soc-2013-paint/release/datafiles/startup.blend
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-paint/source/blender/blenkernel/BKE_global.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_particle.h
    branches/soc-2013-paint/source/blender/blenkernel/BKE_screen.h
    branches/soc-2013-paint/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-paint/source/blender/blenkernel/intern/anim.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/autoexec.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/bpath.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/deform.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/key.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/lattice.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/mball.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/node.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/particle.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-paint/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c
    branches/soc-2013-paint/source/blender/blenlib/intern/graph.c
    branches/soc-2013-paint/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2013-paint/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-paint/source/blender/blenlib/intern/scanfill.c
    branches/soc-2013-paint/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_edgeloop.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mesh_conv.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_beautify.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_poke.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_collapse.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
    branches/soc-2013-paint/source/blender/collada/AnimationExporter.cpp
    branches/soc-2013-paint/source/blender/compositor/SConscript
    branches/soc-2013-paint/source/blender/editors/curve/curve_ops.c
    branches/soc-2013-paint/source/blender/editors/include/ED_screen.h
    branches/soc-2013-paint/source/blender/editors/include/ED_view3d.h
    branches/soc-2013-paint/source/blender/editors/include/UI_interface.h
    branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-paint/source/blender/editors/interface/interface_layout.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_style.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-paint/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-paint/source/blender/editors/interface/resources.c
    branches/soc-2013-paint/source/blender/editors/mesh/editface.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_bevel.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_inset.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-paint/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2013-paint/source/blender/editors/metaball/mball_ops.c
    branches/soc-2013-paint/source/blender/editors/object/object_add.c
    branches/soc-2013-paint/source/blender/editors/object/object_intern.h
    branches/soc-2013-paint/source/blender/editors/object/object_ops.c
    branches/soc-2013-paint/source/blender/editors/object/object_shapekey.c
    branches/soc-2013-paint/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-paint/source/blender/editors/physics/physics_ops.c
    branches/soc-2013-paint/source/blender/editors/render/render_internal.c
    branches/soc-2013-paint/source/blender/editors/render/render_opengl.c
    branches/soc-2013-paint/source/blender/editors/screen/area.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-paint/source/blender/editors/space_action/space_action.c
    branches/soc-2013-paint/source/blender/editors/space_api/spacetypes.c
    branches/soc-2013-paint/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2013-paint/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-paint/source/blender/editors/space_console/space_console.c
    branches/soc-2013-paint/source/blender/editors/space_file/filesel.c
    branches/soc-2013-paint/source/blender/editors/space_file/space_file.c
    branches/soc-2013-paint/source/blender/editors/space_graph/space_graph.c
    branches/soc-2013-paint/source/blender/editors/space_image/space_image.c
    branches/soc-2013-paint/source/blender/editors/space_info/space_info.c
    branches/soc-2013-paint/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2013-paint/source/blender/editors/space_logic/space_logic.c
    branches/soc-2013-paint/source/blender/editors/space_nla/space_nla.c
    branches/soc-2013-paint/source/blender/editors/space_node/node_draw.c
    branches/soc-2013-paint/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-paint/source/blender/editors/space_node/space_node.c
    branches/soc-2013-paint/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2013-paint/source/blender/editors/space_script/space_script.c
    branches/soc-2013-paint/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2013-paint/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2013-paint/source/blender/editors/space_text/space_text.c
    branches/soc-2013-paint/source/blender/editors/space_text/text_ops.c
    branches/soc-2013-paint/source/blender/editors/space_time/space_time.c
    branches/soc-2013-paint/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2013-paint/source/blender/editors/transform/transform.h
    branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_ops.c
    branches/soc-2013-paint/source/blender/editors/util/undo.c
    branches/soc-2013-paint/source/blender/freestyle/SConscript
    branches/soc-2013-paint/source/blender/freestyle/intern/stroke/StrokeRep.cpp
    branches/soc-2013-paint/source/blender/freestyle/intern/view_map/SteerableViewMap.h
    branches/soc-2013-paint/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2013-paint/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-paint/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2013-paint/source/blender/imbuf/intern/thumbs.c
    branches/soc-2013-paint/source/blender/imbuf/intern/util.c
    branches/soc-2013-paint/source/blender/makesdna/DNA_key_types.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_key.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-paint/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2013-paint/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2013-paint/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2013-paint/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-paint/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-paint/source/blender/windowmanager/WM_types.h
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2013-paint/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2013-paint/source/creator/creator.c
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2013-paint/source/tools/spell_check_source.py

Removed Paths:
-------------
    branches/soc-2013-paint/source/blender/blenkernel/intern/script.c

Modified: branches/soc-2013-paint/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-paint/build_files/build_environment/install_deps.sh	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/build_files/build_environment/install_deps.sh	2013-06-26 15:19:11 UTC (rev 57778)
@@ -229,7 +229,7 @@
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.3.0"
+OSL_VERSION="1.3.2"
 OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
@@ -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-paint/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/addon/ui.py	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/intern/cycles/blender/addon/ui.py	2013-06-26 15:19:11 UTC (rev 57778)
@@ -20,7 +20,7 @@
 
 import bpy
 
-from bpy.types import Panel, Menu
+from bpy.types import Panel, Menu, Operator
 
 
 class CYCLES_MT_integrator_presets(Menu):
@@ -547,6 +547,26 @@
             flow.prop(visibility, "shadow")
 
 
+class CYCLES_OT_use_shading_nodes(Operator):
+    """Enable nodes on a material, world or lamp"""
+    bl_idname = "cycles.use_shading_nodes"
+    bl_label = "Use Nodes"
+
+    @classmethod
+    def poll(cls, context):
+        return context.material or context.world or context.lamp
+
+    def execute(self, context):
+        if context.material:
+            context.material.use_nodes = True
+        elif context.world:
+            context.world.use_nodes = True
+        elif context.lamp:
+            context.lamp.use_nodes = True
+
+        return {'FINISHED'}
+
+
 def find_node(material, nodetype):
     if material and material.node_tree:
         ntree = material.node_tree
@@ -568,7 +588,7 @@
 
 def panel_node_draw(layout, id_data, output_type, input_name):
     if not id_data.use_nodes:
-        layout.prop(id_data, "use_nodes", icon='NODETREE')
+        layout.operator("cycles.use_shading_nodes", icon='NODETREE')
         return False
 
     ntree = id_data.node_tree

Modified: branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp	2013-06-26 15:19:11 UTC (rev 57778)
@@ -616,16 +616,22 @@
 	get_status(status, substatus);
 	get_progress(progress, total_time);
 
-	timestatus = string_printf("Mem: %.2fM, Peak: %.2fM | ", mem_used, mem_peak);
+	timestatus = string_printf("Mem:%.2fM, Peak:%.2fM", mem_used, mem_peak);
 
-	timestatus += b_scene.name();
-	if(b_rlay_name != "")
-		timestatus += ", "  + b_rlay_name;
-	timestatus += " | ";
+	if(background) {
+		timestatus += " | " + b_scene.name();
+		if(b_rlay_name != "")
+			timestatus += ", "  + b_rlay_name;
+	}
+	else {
+		timestatus += " | ";
 
-	BLI_timestr(total_time, time_str, sizeof(time_str));
-	timestatus += "Elapsed: " + string(time_str) + " | ";
+		BLI_timestr(total_time, time_str, sizeof(time_str));
+		timestatus += "Time:" + string(time_str);
+	}
 
+	if(status.size() > 0)
+		status = " | " + status;
 	if(substatus.size() > 0)
 		status += " | " + substatus;
 

Modified: branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp	2013-06-26 15:19:11 UTC (rev 57778)
@@ -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-paint/intern/cycles/render/session.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/render/session.cpp	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/intern/cycles/render/session.cpp	2013-06-26 15:19:11 UTC (rev 57778)
@@ -791,12 +791,16 @@
 	else
 		substatus = string_printf("Path Tracing Sample %d/%d", sample+1, tile_manager.num_samples);
 	
-	if(show_pause)
+	if(show_pause) {
 		status = "Paused";
-	else if(show_done)
+	}
+	else if(show_done) {
 		status = "Done";
-	else
-		status = "Rendering";
+	}
+	else {
+		status = substatus;
+		substatus = "";
+	}
 
 	progress.set_status(status, substatus);
 

Modified: branches/soc-2013-paint/release/datafiles/startup.blend
===================================================================
(Binary files differ)

Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py	2013-06-26 15:19:11 UTC (rev 57778)
@@ -1317,8 +1317,8 @@
             if ob.vertex_groups.active:
                 layout.separator()
                 layout.operator("object.vertex_group_assign", text="Assign to Active Group").new = False
-                layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").all = False
-                layout.operator("object.vertex_group_remove_from", text="Remove from All").all = True
+                layout.operator("object.vertex_group_remove_from", text="Remove from Active Group").use_all_groups = False
+                layout.operator("object.vertex_group_remove_from", text="Remove from All").use_all_groups = True
                 layout.separator()
 
         if ob.vertex_groups.active:

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_global.h	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_global.h	2013-06-26 15:19:11 UTC (rev 57778)
@@ -192,8 +192,7 @@
 /* G.moving, signals drawing in (3d) window to denote transform */
 #define G_TRANSFORM_OBJ         1
 #define G_TRANSFORM_EDIT        2
-#define G_TRANSFORM_MANIP       4
-#define G_TRANSFORM_PARTICLE    8
+#define G_TRANSFORM_SEQ         4
 
 /* G.special1 */
 

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_lattice.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_lattice.h	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_lattice.h	2013-06-26 15:19:11 UTC (rev 57778)
@@ -82,5 +82,8 @@
 void BKE_lattice_center_bounds(struct Lattice *lt, float cent[3]);
 void BKE_lattice_translate(struct Lattice *lt, float offset[3], int do_keys);
 
+int  BKE_lattice_index_from_uvw(struct Lattice *lt, const int u, const int v, const int w);
+void BKE_lattice_index_to_uvw(struct Lattice *lt, const int index, int *r_u, int *r_v, int *r_w);
+
 #endif
 

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h	2013-06-26 14:33:28 UTC (rev 57777)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_mesh.h	2013-06-26 15:19:11 UTC (rev 57778)
@@ -138,18 +138,26 @@
 
 /* update the hide flag for edges and polys from the corresponding
  * flag in verts */
-void BKE_mesh_flush_hidden_from_verts(const struct MVert *mvert,
-                                      const struct MLoop *mloop,
-                                      struct MEdge *medge, int totedge,
-                                      struct MPoly *mpoly, int totpoly);
+void BKE_mesh_flush_hidden_from_verts_ex(const struct MVert *mvert,
+                                         const struct MLoop *mloop,
+                                         struct MEdge *medge, const int totedge,
+                                         struct MPoly *mpoly, const int totpoly);
+void BKE_mesh_flush_hidden_from_verts(struct Mesh *me);
 
+void BKE_mesh_flush_hidden_from_polys_ex(struct MVert *mvert,
+                                         const struct MLoop *mloop,
+                                         struct MEdge *medge, int totedge,
+                                         const struct MPoly *mpoly, const int totpoly);
+void BKE_mesh_flush_hidden_from_polys(struct Mesh *me);
+
+
 void BKE_mesh_flush_select_from_polys_ex(struct MVert *mvert,       const int totvert,
-                                         struct MLoop *mloop,
+                                         const struct MLoop *mloop,
                                          struct MEdge *medge,       const int totedge,
                                          const struct MPoly *mpoly, const int totpoly);
 void BKE_mesh_flush_select_from_polys(struct Mesh *me);
 void BKE_mesh_flush_select_from_verts_ex(const struct MVert *mvert, const int totvert,
-                                         struct MLoop *mloop,
+                                         const struct MLoop *mloop,
                                          struct MEdge *medge,       const int totedge,
                                          struct MPoly *mpoly,       const int totpoly);
 void BKE_mesh_flush_select_from_verts(struct Mesh *me);

Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_particle.h
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list