[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57477] branches/soc-2013-cycles_mblur: Merged trunk into branch at r57476.

Gavin Howard gavin.d.howard at gmail.com
Sat Jun 15 21:01:09 CEST 2013


Revision: 57477
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57477
Author:   gdh
Date:     2013-06-15 19:01:08 +0000 (Sat, 15 Jun 2013)
Log Message:
-----------
Merged trunk into branch at r57476.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57476

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
    branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py
    branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c
    branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-cycles_mblur/source/blender/freestyle/CMakeLists.txt
    branches/soc-2013-cycles_mblur/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_solidify.c

Property Changed:
----------------
    branches/soc-2013-cycles_mblur/


Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57459
   + /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57476

Modified: branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/build_files/build_environment/install_deps.sh	2013-06-15 19:01:08 UTC (rev 57477)
@@ -1158,7 +1158,7 @@
 
 compile_OIIO() {
   # To be changed each time we make edits that would modify the compiled result!
-  oiio_magic=11
+  oiio_magic=12
   _init_oiio
 
   # Clean install if needed!
@@ -1352,6 +1352,7 @@
 
     # Optional tests and cmd tools
     cmake_d="$cmake_d -D USE_QT=OFF"
+    cmake_d="$cmake_d -D USE_PYTHON=OFF"
     cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
     #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
@@ -1373,6 +1374,7 @@
 #    if [ -d $INST/ocio ]; then
 #      cmake_d="$cmake_d -D OCIO_PATH=$INST/ocio"
 #    fi
+    cmake_d="$cmake_d -D USE_OCIO=OFF"
 
     if file /bin/cp | grep -q '32-bit'; then
       cflags="-fPIC -m32 -march=i686"

Modified: branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/build_files/buildbot/slave_compile.py	2013-06-15 19:01:08 UTC (rev 57477)
@@ -143,6 +143,8 @@
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
             if builder.find('mingw') != -1:
                 scons_options.append('BF_TOOLSET=mingw')
+            scons_options.append('BF_NUMJOBS=1')
+
         elif builder.find('mac') != -1:
             if builder.find('x86_64') != -1:
                 config = 'user-config-mac-x86_64.py'
@@ -156,9 +158,9 @@
         if builder.find('win') != -1:
             dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
             if builder.find('win64') == -1:
-                dlls_path = 'C:\\b\\redist\\x86'
+                dlls_path = '..\\..\\..\\redist\\x86'
             else:
-                dlls_path = 'C:\\b\\redist\\amd64'
+                dlls_path = '..\\..\\..\\redist\\amd64'
             for dll in dlls:
                 shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
 

Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py	2013-06-15 19:01:08 UTC (rev 57477)
@@ -2075,14 +2075,12 @@
 
         layout.separator()
 
-        mesh_select_mode = context.tool_settings.mesh_select_mode[:]
-        if mesh_select_mode[2]:
-            layout.operator("mesh.dissolve_faces")
-        elif mesh_select_mode[1]:
-            layout.operator("mesh.dissolve_edges")
-        elif mesh_select_mode[0]:
-            layout.operator("mesh.dissolve_verts")
+        layout.operator("mesh.dissolve_verts")
+        layout.operator("mesh.dissolve_edges")
+        layout.operator("mesh.dissolve_faces")
 
+        layout.separator()
+
         layout.operator("mesh.dissolve_limited")
 
         layout.separator()

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h	2013-06-15 19:01:08 UTC (rev 57477)
@@ -361,6 +361,13 @@
 
 void BKE_mesh_do_versions_cd_flag_init(struct Mesh *mesh);
 
+
+void BKE_mesh_mselect_clear(struct Mesh *me);
+void BKE_mesh_mselect_validate(struct Mesh *me);
+int  BKE_mesh_mselect_find(struct Mesh *me, int index, int type);
+int  BKE_mesh_mselect_active_get(struct Mesh *me, int type);
+void BKE_mesh_mselect_active_set(struct Mesh *me, int index, int type);
+
 #ifdef __cplusplus
 }
 #endif

Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c	2013-06-15 19:01:08 UTC (rev 57477)
@@ -3767,3 +3767,132 @@
 
 	}
 }
+
+
+/* -------------------------------------------------------------------- */
+/* MSelect functions (currently used in weight paint mode) */
+
+void BKE_mesh_mselect_clear(Mesh *me)
+{
+	if (me->mselect) {
+		MEM_freeN(me->mselect);
+		me->mselect = NULL;
+	}
+	me->totselect = 0;
+}
+
+void BKE_mesh_mselect_validate(Mesh *me)
+{
+	MSelect *mselect_src, *mselect_dst;
+	int i_src, i_dst;
+
+	if (me->totselect == 0)
+		return;
+
+	mselect_src = me->mselect;
+	mselect_dst = MEM_mallocN(sizeof(MSelect) * (me->totselect), "Mesh selection history");
+
+	for (i_src = 0, i_dst = 0; i_src < me->totselect; i_src++) {
+		int index = mselect_src[i_src].index;
+		switch (mselect_src[i_src].type) {
+			case ME_VSEL:
+			{
+				if (me->mvert[index].flag & SELECT) {
+					mselect_dst[i_dst] = mselect_src[i_src];
+					i_dst++;
+				}
+				break;
+			}
+			case ME_ESEL:
+			{
+				if (me->medge[index].flag & SELECT) {
+					mselect_dst[i_dst] = mselect_src[i_src];
+					i_dst++;
+				}
+				break;
+			}
+			case ME_FSEL:
+			{
+				if (me->mpoly[index].flag & SELECT) {
+					mselect_dst[i_dst] = mselect_src[i_src];
+					i_dst++;
+				}
+				break;
+			}
+			default:
+			{
+				BLI_assert(0);
+				break;
+			}
+		}
+	}
+
+	MEM_freeN(mselect_src);
+
+	if (i_dst == 0) {
+		MEM_freeN(mselect_dst);
+		mselect_dst = NULL;
+	}
+	else if (i_dst != me->totselect) {
+		mselect_dst = MEM_reallocN(mselect_dst, sizeof(MSelect) * i_dst);
+	}
+
+	me->totselect = i_dst;
+	me->mselect = mselect_dst;
+
+}
+
+/**
+ * Return the index within me->mselect, or -1
+ */
+int BKE_mesh_mselect_find(Mesh *me, int index, int type)
+{
+	int i;
+
+	BLI_assert(ELEM3(type, ME_VSEL, ME_ESEL, ME_FSEL));
+
+	for (i = 0; i < me->totselect; i++) {
+		if ((me->mselect[i].index == index) &&
+			(me->mselect[i].type == type))
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+/**
+ * Return The index of the active element.
+ */
+int BKE_mesh_mselect_active_get(Mesh *me, int type)
+{
+	BLI_assert(ELEM3(type, ME_VSEL, ME_ESEL, ME_FSEL));
+
+	if (me->totselect) {
+		if (me->mselect[me->totselect - 1].type == type) {
+			return me->mselect[me->totselect - 1].index;
+		}
+	}
+	return -1;
+}
+
+void BKE_mesh_mselect_active_set(Mesh *me, int index, int type)
+{
+	const int msel_index = BKE_mesh_mselect_find(me, index, type);
+
+	if (msel_index == -1) {
+		/* add to the end */
+		me->mselect = MEM_reallocN(me->mselect, sizeof(MSelect) * (me->totselect + 1));
+		me->mselect[me->totselect].index = index;
+		me->mselect[me->totselect].type  = type;
+		me->totselect++;
+	}
+	else if (msel_index != me->totselect - 1) {
+		/* move to the end */
+		SWAP(MSelect, me->mselect[msel_index], me->mselect[me->totselect - 1]);
+	}
+
+	BLI_assert((me->mselect[me->totselect - 1].index == index) &&
+	           (me->mselect[me->totselect - 1].type  == type));
+}

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editface.c	2013-06-15 19:01:08 UTC (rev 57477)
@@ -619,6 +619,17 @@
 		}
 	}
 
+	/* handle mselect */
+	if (action == SEL_SELECT) {
+		/* pass */
+	}
+	else if (ELEM(action, SEL_DESELECT, SEL_INVERT)) {
+		BKE_mesh_mselect_clear(me);
+	}
+	else {
+		BKE_mesh_mselect_validate(me);
+	}
+
 	if (flush_flags) {
 		paintvert_flush_flags(ob);
 	}

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c	2013-06-15 15:39:20 UTC (rev 57476)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/mesh/meshtools.c	2013-06-15 19:01:08 UTC (rev 57477)
@@ -947,7 +947,6 @@
 	else {
 		return mesh_get_x_mirror_vert_spatial(ob, index);
 	}
-	return 0;
 }
 
 static BMVert *editbmesh_get_x_mirror_vert_spatial(Object *ob, BMEditMesh *em, const float co[3])

Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_ops.c

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list