Commit: b6e99a672b4250c38d8544b8d33c9fd658caf800
Author: Antony Riakiotakis
Date: Wed Mar 18 20:29:35 2015 +0100
Branches: temp_viewport_fx_merge
https://developer.blender.org/rBb6e99a672b4250c38d8544b8d33c9fd658caf800
Blender now compiles (whee) but don't try to run it :p
===================================================================
M source/blender/gpu/intern/gpu_aspect.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_aspect.c
b/source/blender/gpu/intern/gpu_aspect.c
index c049ff7..6eb68ab 100644
--- a/source/blender/gpu/intern/gpu_aspect.c
+++ b/source/blender/gpu/intern/gpu_aspect.c
@@ -89,7 +89,7 @@ bool GPU_commit_aspect(void)
GPUaspectimpl* aspectImpl;
BLI_assert(current_aspect != -1);
- BLI_assert(in_select_mode == gpu_is_select_mode()); /* not allowed to
change select/render mode while an aspect is active */
+// BLI_assert(in_select_mode == gpu_is_select_mode()); /* not allowed to
change select/render mode while an aspect is active */
aspectImpl = GPU_ASPECT_FUNCS[current_aspect];
@@ -170,7 +170,8 @@ bool GPU_aspect_begin(uint32_t aspect, void* param)
current_aspect = aspect;
- in_select_mode = gpu_is_select_mode();
+ /* fix this! XXX psy-fi */
+ in_select_mode = false; //gpu_is_select_mode();
aspectImpl = GPU_ASPECT_FUNCS[aspect];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
