[Bf-blender-cvs] [df125e5] soc-2014-nurbs: blender build fix

Jonathan deWerd noreply at git.blender.org
Fri Jun 27 08:14:59 CEST 2014


Commit: df125e5f9849f901691952c8ee5706f170dd7337
Author: Jonathan deWerd
Date:   Fri Jun 27 02:09:52 2014 -0400
https://developer.blender.org/rBdf125e5f9849f901691952c8ee5706f170dd7337

blender build fix

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	scons
M	source/blender/editors/io/io_rhino_import.cpp
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index f3d1f81..8404dc4 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f3d1f8127094dc64eb889e41792fd4c2d877d5bb
+Subproject commit 8404dc4379a88a5e2ef63d0a83141cc5feb1a5e6
diff --git a/release/scripts/addons b/release/scripts/addons
index 9948cd6..d030a69 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 9948cd6025f29fad12eaf6d3b0e738dfb2b50d4a
+Subproject commit d030a694ef323390861bfff6d2bacdadd41dd484
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 0bd307a..cc6fe61 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 0bd307ae8cc7746b433c0baf9be13dc662b47f08
+Subproject commit cc6fe6177a9224953c2848437b9dbb3e8650ca9a
diff --git a/scons b/scons
index 1ec9310..59512aa 160000
--- a/scons
+++ b/scons
@@ -1 +1 @@
-Subproject commit 1ec93106c40fab0c339d09c7ed9897c85ddf3da5
+Subproject commit 59512aadd1d16d7b9327f0eefafb23513b4f2137
diff --git a/source/blender/editors/io/io_rhino_import.cpp b/source/blender/editors/io/io_rhino_import.cpp
index 2195b5f..aa31a1b 100644
--- a/source/blender/editors/io/io_rhino_import.cpp
+++ b/source/blender/editors/io/io_rhino_import.cpp
@@ -613,6 +613,12 @@ static void rhino_import_surface(bContext *C,
 			rhino_import_nurbs_surf(C, ns, obj, attrs, newobj);
 			delete ns;
 		}
+		did_handle = true;
+	}
+	if (!did_handle) {
+		char surf_name[MAX_ID_NAME];
+		
+		printf("couldn't handle ")
 	}
 }
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index eef1c74..bc1db94 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1035,6 +1035,7 @@ endif()
 
 	if(WITH_LIBMV)
 		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
+		list(APPEND BLENDER_SORTED_LIBS extern_glog)
 	endif()
 
 	if(WITH_MOD_CLOTH_ELTOPO)




More information about the Bf-blender-cvs mailing list