[Bf-blender-cvs] [554e774] temp_widgets_c++_experiment: Dummy commit for quick heads-up on this branch
Julian Eisel
noreply at git.blender.org
Sat Feb 6 20:37:20 CET 2016
Commit: 554e7748b32f53a1aa9c78979817cdb37650f720
Author: Julian Eisel
Date: Sat Feb 6 20:25:59 2016 +0100
Branches: temp_widgets_c++_experiment
https://developer.blender.org/rB554e7748b32f53a1aa9c78979817cdb37650f720
Dummy commit for quick heads-up on this branch
The temp_widgets_c++_experiment branch will for now be deleted from git.blender.org repository, it will stay available here https://github.com/julianeisel/blender/tree/temp_widgets_c++_experiment.
Although this branch was already quite advanced, I realized it's better to stay with regular C for now. Moving the widgets core to C++ at a later point is still an option, but for now the changes and workarounds needed are too drastic (mainly because RNA/DNA doesn't really support C++).
Some of the refactoring changes made will be ported to wiggly-widgets branch though.
===================================================================
M source/blender/gpu/intern/gpu_buffers.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 6a63df0..c280faa 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -785,17 +785,17 @@ void GPU_facemap_setup(DerivedMesh *dm)
{
if (!gpu_buffer_setup_common(dm, GPU_BUFFER_FACEMAP, false))
return;
-
+
if (!gpu_buffer_setup_common(dm, GPU_BUFFER_VERTEX, false))
return;
glEnableClientState(GL_VERTEX_ARRAY);
glBindBuffer(GL_ARRAY_BUFFER_ARB, dm->drawObject->points->id);
glVertexPointer(3, GL_FLOAT, 0, 0);
-
+
GLStates |= GPU_BUFFER_VERTEX_STATE;
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, dm->drawObject->facemapindices->id);
-
+
GLStates |= GPU_BUFFER_ELEMENT_STATE;
}
More information about the Bf-blender-cvs
mailing list