[Bf-blender-cvs] [96f28f9] master: [CMAKE/Platform/Windows] Only perform version check if the actual compiler is MSVC
Commit: 96f28f9b5060f823631ced28e325e5d6b11c25b4
Author: lazydodo
Date: Sat Sep 10 17:58:56 2016 -0600
Branches: master
https://developer.blender.org/rB96f28f9b5060f823631ced28e325e5d6b11c25b4
[CMAKE/Platform/Windows] Only perform version check if the actual compiler is
MSVC
===
M build_files/cmake/platform/platform_win32_msvc.cmake
===
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake
b/build_files/cmake/platform/platform_win32_msvc.cmake
index 2772944..4ba6f44 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -39,20 +39,22 @@ endmacro()
add_definitions(-DWIN32)
# Minimum MSVC Version
-if(MSVC_VERSION EQUAL 1800)
- set(_min_ver "18.0.31101")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2013 (Update 4, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+ if(MSVC_VERSION EQUAL 1800)
+ set(_min_ver "18.0.31101")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2013 (Update 4, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
-endif()
-if(MSVC_VERSION EQUAL 1900)
- set(_min_ver "19.0.24210")
- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
- message(FATAL_ERROR
- "Visual Studio 2015 (Update 3, ${_min_ver}) required, "
- "found (${CMAKE_CXX_COMPILER_VERSION})")
+ if(MSVC_VERSION EQUAL 1900)
+ set(_min_ver "19.0.24210")
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+ message(FATAL_ERROR
+ "Visual Studio 2015 (Update 3, ${_min_ver})
required, "
+ "found (${CMAKE_CXX_COMPILER_VERSION})")
+ endif()
endif()
endif()
unset(_min_ver)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [9fc1cfc] master: Fix undefined variable on errors in Cycles ctests.
Commit: 9fc1cfc4f1e61d5c4c929ead6736afa2d88f5969
Author: Dmitry Dygalo
Date: Sat Sep 10 22:55:28 2016 +0200
Branches: master
https://developer.blender.org/rB9fc1cfc4f1e61d5c4c929ead6736afa2d88f5969
Fix undefined variable on errors in Cycles ctests.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2201
===
M tests/python/cycles_render_tests.py
===
diff --git a/tests/python/cycles_render_tests.py
b/tests/python/cycles_render_tests.py
index fb9a4b3..78b4b34 100755
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -38,11 +38,11 @@ def render_file(filepath):
elif b"blender probably wont start" in e.output:
return "NO_START"
return "CRASH"
-except:
+except BaseException as e:
if os.path.exists(TEMP_FILE):
os.remove(TEMP_FILE)
if VERBOSE:
-print(e.output.decode("utf-8"))
+print(e)
return "CRASH"
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [56064b5] master: NDOF: allow view movement for modal border and circle select operators.
Commit: 56064b508b93ada8354af50596a2aa66f90dd79b
Author: Kai Mach
Date: Sat Sep 10 23:33:26 2016 +0200
Branches: master
https://developer.blender.org/rB56064b508b93ada8354af50596a2aa66f90dd79b
NDOF: allow view movement for modal border and circle select operators.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D2167
===
M source/blender/windowmanager/intern/wm_operators.c
===
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 0c13722..7177244 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2299,6 +2299,11 @@ int WM_border_select_modal(bContext *C, wmOperator *op,
const wmEvent *event)
}
}
+#ifdef WITH_INPUT_NDOF
+ else if (event->type == NDOF_MOTION) {
+ return OPERATOR_PASS_THROUGH;
+ }
+#endif
// /* Allow view navigation??? */
// else {
// return OPERATOR_PASS_THROUGH;
@@ -2413,6 +2418,11 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op,
const wmEvent *event)
return OPERATOR_FINISHED; /* use finish or we
don't get an undo */
}
}
+#ifdef WITH_INPUT_NDOF
+ else if (event->type == NDOF_MOTION) {
+ return OPERATOR_PASS_THROUGH;
+ }
+#endif
/* Allow view navigation??? */
/* note, this gives issues: 1) other modal ops run on top (border
select), 2) middlemouse is used now 3) tablet/trackpad? */
// else {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [e204168] asset-engine: Merge branch 'master' into asset-engine
Commit: e2041687109f13b3e82fbf8903a3bf393cd4ce7c Author: Bastien Montagne Date: Sat Sep 10 16:14:43 2016 +0200 Branches: asset-engine https://developer.blender.org/rBe2041687109f13b3e82fbf8903a3bf393cd4ce7c Merge branch 'master' into asset-engine === === ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [0099b34] asset-engine: Claude: WIP, listing is kind of working, mush to be fixed still though, and of course no import yet.
Commit: 0099b345316cdcc9f92423951ca30b33205f4d71
Author: Bastien Montagne
Date: Sat Sep 10 22:42:41 2016 +0200
Branches: asset-engine
https://developer.blender.org/rB0099b345316cdcc9f92423951ca30b33205f4d71
Claude: WIP, listing is kind of working, mush to be fixed still though, and of
course no import yet.
===
M release/scripts/startup/bl_operators/claude/__init__.py
===
diff --git a/release/scripts/startup/bl_operators/claude/__init__.py
b/release/scripts/startup/bl_operators/claude/__init__.py
index e34987b..8a03536 100644
--- a/release/scripts/startup/bl_operators/claude/__init__.py
+++ b/release/scripts/startup/bl_operators/claude/__init__.py
@@ -109,7 +109,7 @@ class ClaudeRepository:
self.is_ready = False
def check_dir_do(self, root_path, do_change, do_update_intern):
-if self.curr_path == root_path:
+if not do_update_intern and self.curr_path == root_path:
return True, root_path
parts = root_path.parts
if do_update_intern:
@@ -121,9 +121,9 @@ class ClaudeRepository:
paths = self.path_map
idx = 0
for i, p in enumerate(parts[1:]):
-idx = i + 1
+idx = i + 2
nid, paths = paths.get(p, (None, None))
-print(p, nid, paths)
+#~ print(p, nid, paths)
if nid is None:
idx -= 1
break
@@ -131,7 +131,7 @@ class ClaudeRepository:
nids.append(nid)
if do_update_intern:
self.pending_path = parts[idx:]
-self.curr_path = pillar.CloudPath("/" + "/".join(parts[1:idx +
1]))
+self.curr_path = pillar.CloudPath("/" + "/".join(parts[1:idx]))
self.curr_path_real = pillar.CloudPath("/" + "/".join(nids))
return True, root_path
elif do_change:
@@ -206,32 +206,26 @@ class ClaudeJobCheckCredentials(ClaudeJob):
Returns None if the user cannot be found, or if the user is not a
Cloud subscriber.
"""
try:
-print("Awaiting pillar.check_pillar_credentials...")
user_id = await
pillar.check_pillar_credentials(REQUIRED_ROLES_FOR_CLAUDE)
-print("Done pillar.check_pillar_credentials...")
except pillar.NotSubscribedToCloudError:
-print('Not subsribed.')
+print('Not subscribed.')
return None
except pillar.CredentialsNotSyncedError:
print('Credentials not synced, re-syncing automatically.')
#~ self.log.info('Credentials not synced, re-syncing
automatically.')
else:
-print('Credentials okay.')
#~ self.log.info('Credentials okay.')
return user_id
try:
-print("awaiting pillar.refresh_pillar_credentials...")
user_id = await pillar.refresh_pillar_credentials(required_roles)
-print("Done pillar.refresh_pillar_credentials...")
except pillar.NotSubscribedToCloudError:
-print('Not subsribed.')
+print('Not subscribed.')
return None
except pillar.UserNotLoggedInError:
print('User not logged in on Blender ID.')
#~ self.log.error('User not logged in on Blender ID.')
else:
-print('Credentials refreshed and ok.')
#~ self.log.info('Credentials refreshed and ok.')
return user_id
@@ -249,11 +243,9 @@ class ClaudeJobCheckCredentials(ClaudeJob):
if (self.progress > 1.0):
self.progress = 0.0
-print("Updating credential status, ", self.check_task, " | Done: ",
self.check_task.done() if self.check_task else "")
if self.check_task is not None:
if not self.check_task.done():
return ...
-print("Cred check finished, we should have cloud access...")
user_id = self.check_task.result()
self.check_task = self.remove_task(self.check_task)
self.progress = 1.0
@@ -279,7 +271,6 @@ class ClaudeJobList(ClaudeJob):
async def ls_do(part):
project_uuid = repo.curr_path_real.project_uuid
node_uuid = repo.curr_path_real.node_uuid
-repo.nodes.clear()
# XXX Not nice to redo whole path, should be cached...
curr_path_map = repo.path_map
@@ -290,14 +281,14 @@ class ClaudeJobList(ClaudeJob):
if node_uuid:
# Query for sub-nodes of this node.
-print("Getting subnodes for parent node %r" % node_uuid)
+print("Getting subnodes for parent node %r (%s)" % (node_uuid,
repo.curr_path))
children = [UpNode()]
-children += await
[Bf-blender-cvs] [d8681c9] master: Fix OpenSubdiv related buffer overrun with multiple FVar channels.
Commit: d8681c99c4290d38f38e67a2e1b9f7119221a569
Author: Alexander Gavrilov
Date: Sat Sep 10 21:15:52 2016 +0300
Branches: master
https://developer.blender.org/rBd8681c99c4290d38f38e67a2e1b9f7119221a569
Fix OpenSubdiv related buffer overrun with multiple FVar channels.
The existing code uses the input value count of the first channel
for all of them. If the first channel is the largest, it leads to
a crash-causing buffer overrun in memcpy below. Likely this was
left since the time when only one channel was supported.
As a crash fix, probably should go into 2.78
===
M intern/opensubdiv/opensubdiv_capi.cc
===
diff --git a/intern/opensubdiv/opensubdiv_capi.cc
b/intern/opensubdiv/opensubdiv_capi.cc
index ab90495..52ce98f 100644
--- a/intern/opensubdiv/opensubdiv_capi.cc
+++ b/intern/opensubdiv/opensubdiv_capi.cc
@@ -165,7 +165,7 @@ static void
interpolate_fvar_data(OpenSubdiv::Far::TopologyRefiner& refiner,
const int max_level = refiner.GetMaxLevel();
size_t fvar_data_offset = 0, values_offset = 0;
for (int channel = 0; channel < refiner.GetNumFVarChannels();
++channel) {
- const int num_values = refiner.GetLevel(0).GetNumFVarValues(0)
* 2,
+ const int num_values =
refiner.GetLevel(0).GetNumFVarValues(channel) * 2,
num_values_max =
refiner.GetLevel(max_level).GetNumFVarValues(channel),
num_values_total =
refiner.GetNumFVarValuesTotal(channel);
if (num_values_total <= 0) {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] [037df2a] master: Fix T49303: Fix T49314: More issues with new handling of X11 shortcuts.
Commit: 037df2aaa6b36aa4f4e78f3ef978a8196be0057d
Author: Bastien Montagne
Date: Sat Sep 10 12:38:12 2016 +0200
Branches: master
https://developer.blender.org/rB037df2aaa6b36aa4f4e78f3ef978a8196be0057d
Fix T49303: Fix T49314: More issues with new handling of X11 shortcuts.
This commits changes two things:
* It adds more keysyms preferably taken from XLookupKeysym than XLookupString
(namely, all numpad ones).
* It falls back to keysyms from XLookupKeysym in other cases, when
XLookupString does not produce anything we know of.
Finding the correct balance here is far from easy, but think we are comming
rather close to it now...
===
M intern/ghost/intern/GHOST_SystemX11.cpp
===
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp
b/intern/ghost/intern/GHOST_SystemX11.cpp
index 9a2dcfc..30cfac0 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -902,7 +902,8 @@ GHOST_SystemX11::processEvent(XEvent *xe)
ascii = '\0';
}
- /* Only allow a very limited set of keys from
XLookupKeysym, all others we take from XLookupString... */
+ /* Only allow a limited set of keys from XLookupKeysym,
all others we take from XLookupString,
+* unless it gives unknown key... */
gkey = convertXKey(key_sym);
switch (gkey) {
case GHOST_kKeyRightAlt:
@@ -922,9 +923,28 @@ GHOST_SystemX11::processEvent(XEvent *xe)
case GHOST_kKey7:
case GHOST_kKey8:
case GHOST_kKey9:
+ case GHOST_kKeyNumpad0:
+ case GHOST_kKeyNumpad1:
+ case GHOST_kKeyNumpad2:
+ case GHOST_kKeyNumpad3:
+ case GHOST_kKeyNumpad4:
+ case GHOST_kKeyNumpad5:
+ case GHOST_kKeyNumpad6:
+ case GHOST_kKeyNumpad7:
+ case GHOST_kKeyNumpad8:
+ case GHOST_kKeyNumpad9:
+ case GHOST_kKeyNumpadPeriod:
+ case GHOST_kKeyNumpadEnter:
+ case GHOST_kKeyNumpadPlus:
+ case GHOST_kKeyNumpadMinus:
+ case GHOST_kKeyNumpadAsterisk:
+ case GHOST_kKeyNumpadSlash:
break;
default:
- gkey = convertXKey(key_sym_str);
+ GHOST_TKey gkey_str =
convertXKey(key_sym_str);
+ if (gkey_str != GHOST_kKeyUnknown) {
+ gkey = gkey_str;
+ }
}
#else
/* In keyboards like latin ones,
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
