[Bf-blender-cvs] [3caae7707ff] soc-2018-npr: Revert "Revert "OpenSubdiv: Fix wrong topology refiner cast""

Sebastian Parborg noreply at git.blender.org
Mon Jul 16 03:29:02 CEST 2018


Commit: 3caae7707ffbda7afe6705d032b33d30dbc73025
Author: Sebastian Parborg
Date:   Thu Jul 12 17:29:38 2018 +0200
Branches: soc-2018-npr
https://developer.blender.org/rB3caae7707ffbda7afe6705d032b33d30dbc73025

Revert "Revert "OpenSubdiv: Fix wrong topology refiner cast""

This reverts commit 551f181742cfcbf4528369619dcfdb3a0a9d5f46.

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

M	intern/opensubdiv/opensubdiv_evaluator_capi.cc

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

diff --git a/intern/opensubdiv/opensubdiv_evaluator_capi.cc b/intern/opensubdiv/opensubdiv_evaluator_capi.cc
index 8baba0061ce..19083fbabcc 100644
--- a/intern/opensubdiv/opensubdiv_evaluator_capi.cc
+++ b/intern/opensubdiv/opensubdiv_evaluator_capi.cc
@@ -42,6 +42,7 @@
 #include <opensubdiv/osd/types.h>
 
 #include "opensubdiv_intern.h"
+#include "opensubdiv_topology_refiner.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -404,7 +405,7 @@ OpenSubdiv_EvaluatorDescr *openSubdiv_createEvaluatorDescr(
         int subsurf_level)
 {
 	/* TODO(sergey): Look into re-using refiner with GLMesh. */
-	TopologyRefiner *refiner = (TopologyRefiner *)topology_refiner;
+	TopologyRefiner *refiner = topology_refiner->osd_refiner;
 	if(refiner == NULL) {
 		/* Happens on bad topology. */
 		return NULL;



More information about the Bf-blender-cvs mailing list