Commit: 46cd609c2f8f942cbeb08a43d70ede66f17b51af
Author: Campbell Barton
Date: Fri Jul 17 00:28:32 2015 +1000
Branches: temp-derivedmesh-looptri
https://developer.blender.org/rB46cd609c2f8f942cbeb08a43d70ede66f17b51af
Remove redundant if check
===================================================================
M source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c
b/source/blender/blenkernel/intern/cdderivedmesh.c
index e66049a..ae8308f 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -683,18 +683,15 @@ static void cdDM_drawMappedFaces(
GPU_normal_setup(dm);
if (useColors) {
-
- if (flag & DM_DRAW_USE_COLORS) {
- colType = CD_TEXTURE_MLOOPCOL;
+ colType = CD_TEXTURE_MLOOPCOL;
+ mloopcol = DM_get_loop_data_layer(dm, colType);
+ if (!mloopcol) {
+ colType = CD_PREVIEW_MLOOPCOL;
+ mloopcol = DM_get_loop_data_layer(dm, colType);
+ }
+ if (!mloopcol) {
+ colType = CD_MLOOPCOL;
mloopcol = DM_get_loop_data_layer(dm, colType);
- if (!mloopcol) {
- colType = CD_PREVIEW_MLOOPCOL;
- mloopcol = DM_get_loop_data_layer(dm,
colType);
- }
- if (!mloopcol) {
- colType = CD_MLOOPCOL;
- mloopcol = DM_get_loop_data_layer(dm,
colType);
- }
}
if (useColors && mloopcol) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
